From 0e84cb6c13b8b47ed0d05b21f14490bf6c4744f2 Mon Sep 17 00:00:00 2001
From: ConfuSomu
Date: Mon, 10 Jul 2023 13:50:03 +0200
Subject: Rename variables in Archive::get_html_status_info

This fixes misleading variable names.
---
 src/archive_parser.cpp | 62 +++++++++++++++++++++++++-------------------------
 1 file changed, 31 insertions(+), 31 deletions(-)

(limited to 'src')

diff --git a/src/archive_parser.cpp b/src/archive_parser.cpp
index 85083ac..fbc8aa0 100644
--- a/src/archive_parser.cpp
+++ b/src/archive_parser.cpp
@@ -235,8 +235,8 @@ std::vector<APAttachmentFields> Archive::get_status_attachments_list(QJsonValueR
 
 // status_index is assumed to be a valid index
 const QString Archive::get_html_status_info(int status_index, int text_zone_width, StatusType status_type, QLocale* locale) {
-    // the JSON AP Activity (TODO: fix misleading name)
-    QJsonObject obj = outbox_items->at(status_index).toObject();
+    // the JSON AP Activity
+    QJsonObject activity = outbox_items->at(status_index).toObject();
 
     APActivityFields act_fields = {
         .visibility = status_type
@@ -247,52 +247,52 @@ const QString Archive::get_html_status_info(int status_index, int text_zone_widt
     // The post
     APObjectFields obj_fields;
 
-    if (obj.contains("type") and obj["type"].isString()) {
-        QString type = obj["type"].toString();
+    if (activity.contains("type") and activity["type"].isString()) {
+        QString type = activity["type"].toString();
         if (type == "Create") act_fields.type = APActivityType::CREATE;
         else if (type == "Announce") act_fields.type = APActivityType::ANNOUNCE;
         else act_fields.type = APActivityType::UNKNOWN;
     }
 
-    if (obj.contains("published") and obj["published"].isString())
-        act_fields.published = obj["published"].toString();
+    if (activity.contains("published") and activity["published"].isString())
+        act_fields.published = activity["published"].toString();
 
-    if (obj.contains("id") and obj["id"].isString())
-        act_fields.object_url = obj["id"].toString();
+    if (activity.contains("id") and activity["id"].isString())
+        act_fields.object_url = activity["id"].toString();
 
-    if (obj.contains("actor"))
-        act_fields.by_actor = obj["actor"].toString(); // returns Null string if actor is not a string
+    if (activity.contains("actor"))
+        act_fields.by_actor = activity["actor"].toString(); // returns Null string if actor is not a string
 
-    act_fields.to_actors = get_status_object_list(obj, "to");
-    act_fields.cc_actors = get_status_object_list(obj, "cc");
+    act_fields.to_actors = get_status_object_list(activity, "to");
+    act_fields.cc_actors = get_status_object_list(activity, "cc");
 
-    if (obj["object"].isObject()) {
-        // the JSON AP Object (TODO: fix misleading name)
-        QJsonObject activity = obj["object"].toObject();
+    if (activity["object"].isObject()) {
+        // the JSON AP Object
+        QJsonObject object = activity["object"].toObject();
 
-        obj_fields.visibility = get_status_type(activity);
+        obj_fields.visibility = get_status_type(object);
 
-        if (activity.contains("summary"))
-            obj_fields.summary = activity["summary"].toString();
+        if (object.contains("summary"))
+            obj_fields.summary = object["summary"].toString();
 
-        obj_fields.attachments = get_status_attachments_list(activity["attachment"]);
+        obj_fields.attachments = get_status_attachments_list(object["attachment"]);
 
-        obj_fields.web_url = activity["url"].toString();
-        obj_fields.object_url = activity["atomUri"].toString(); // atomUri?
-        obj_fields.reply_to_url = activity["inReplyTo"].toString();
+        obj_fields.web_url = object["url"].toString();
+        obj_fields.object_url = object["atomUri"].toString(); // atomUri?
+        obj_fields.reply_to_url = object["inReplyTo"].toString();
 
-        if (activity["content"].isString()) {
-            obj_fields.content = activity["content"].toString();
-            obj_fields.languages = get_status_object_language_list(activity);
+        if (object["content"].isString()) {
+            obj_fields.content = object["content"].toString();
+            obj_fields.languages = get_status_object_language_list(object);
         }
 
-        obj_fields.to_actors = get_status_object_list(activity, "to");
-        obj_fields.cc_actors = get_status_object_list(activity, "cc");
-        obj_fields.by_actor = activity["attributedTo"].toString();
-        obj_fields.published = activity["published"].toString();
+        obj_fields.to_actors = get_status_object_list(object, "to");
+        obj_fields.cc_actors = get_status_object_list(object, "cc");
+        obj_fields.by_actor = object["attributedTo"].toString();
+        obj_fields.published = object["published"].toString();
 
-    } else if (obj["object"].isString())
-        obj_url = obj["object"].toString();
+    } else if (activity["object"].isString())
+        obj_url = activity["object"].toString();
 
     if (obj_url.isNull())
         act_fields.object = new APPost(obj_fields);
-- 
cgit v1.2.3-54-g00ecf