@@ -16,9 +16,36 @@
 @cross_origin()
 @login_exempt
 def root():
+    # Read the current tweets from the API or other source
+    current_tweets = readTootsApiJson()
+
+    # Read additional tweets from file_tweets.json
+    try:
+        with open('data/file_tweets.json', 'r') as file:
+            file_tweets_data = json.load(file)
+            # Check if the data is a dictionary
+            if isinstance(file_tweets_data, dict):
+                # If the current tweets are also a dictionary, update it
+                if isinstance(current_tweets, dict):
+                    current_tweets.update(file_tweets_data)
+                # If the current tweets are a list, convert the dictionary to a list and extend it
+                elif isinstance(current_tweets, list):
+                    current_tweets.extend(file_tweets_data.values())
+                else:
+                    raise ValueError("The current tweets are neither a list nor a dictionary.")
+            else:
+                raise ValueError("The contents of file_tweets.json are not a dictionary")
+    except FileNotFoundError:
+        logging.error("The file file_tweets.json was not found.")
+    except json.JSONDecodeError:
+        logging.error("The file file_tweets.json does not contain valid JSON.")
+    except ValueError as e:
+        logging.error(e)
+
+    # Return the combined data as a JSON response
     return Response(json.dumps({
         'date': int(datetime.timestamp(datetime.now())),
-        'tweets': readTootsApiJson()
+        'tweets': current_tweets
     }), mimetype='application/json')
 
 
@@ -37,7 +64,35 @@ def forest_create():
     logging.warning('Manual invocation of creating forest!')
     forest = TootForest.fromFolder()
     forest.saveApiJson()
-    return Response(json.dumps(readTootsApiJson()), mimetype='application/json')
+
+    # Read the current tweets from the API or other source
+    current_tweets = readTootsApiJson()
+
+    # Read additional tweets from file_tweets.json
+    try:
+        with open('data/file_tweets.json', 'r') as file:
+            file_tweets_data = json.load(file)
+            # Check if the data is a dictionary
+            if isinstance(file_tweets_data, dict):
+                # If the current tweets are also a dictionary, update it
+                if isinstance(current_tweets, dict):
+                    current_tweets.update(file_tweets_data)
+                # If the current tweets are a list, convert the dictionary to a list and extend it
+                elif isinstance(current_tweets, list):
+                    current_tweets.extend(file_tweets_data.values())
+                else:
+                    raise ValueError("The current tweets are neither a list nor a dictionary.")
+            else:
+                raise ValueError("The contents of file_tweets.json are not a dictionary")
+    except FileNotFoundError:
+        logging.error("The file file_tweets.json was not found.")
+    except json.JSONDecodeError:
+        logging.error("The file file_tweets.json does not contain valid JSON.")
+    except ValueError as e:
+        logging.error(e)
+
+    # Return the combined data as a JSON response
+    return Response(json.dumps(current_tweets), mimetype='application/json')
 
 @bp.route('/add/<int:id>')
 def add(id):
 
@@ -59,6 +59,7 @@ def asApiDict(self, add = {}):
             'display_name': self.getUserScreenName(),
             'avatar': self.getUserImageHttps(),
             'media': self.getMedia(),
+            'source': 'mastodon.social',
             **add
         }
 
 
@@ -49,11 +49,12 @@ def stream_with_reconnection(self):
         while retry_count < max_retries:
             try:
                 self.mastodon.stream_public(self)
+                retry_count = 0
                 break
             except Exception as e:
                 self.receivedHeartbeat = False
                 logging.warning("Error: ", e)
-                logging.info("Trying to reconnect after " + str(retry_delay) + "seconds.")
+                logging.info("Trying to reconnect after " + str(retry_delay) + " seconds.")
                 retry_count += 1
                 time.sleep(retry_delay)
 
@@ -88,7 +89,6 @@ def handle_heartbeat(self):
         if not self.receivedHeartbeat:
             logging.info("Connected to server. Listening.")
             self.receivedHeartbeat = True
-            retry_count = 0
 
     def on_abort(self, status_code):
         logging.warning('Listener got error, status code: {}'.format(status_code))
Original file line number	Diff line number	Diff line change
`@@ -59,6 +59,7 @@ def asApiDict(self, add = {}):`
`59`	`59`	`'display_name': self.getUserScreenName(),`
`60`	`60`	`'avatar': self.getUserImageHttps(),`
`61`	`61`	`'media': self.getMedia(),`
	`62`	`+ 'source': 'mastodon.social',`
`62`	`63`	`**add`
`63`	`64`	`}`
`64`	`65`