fix issue #3, optimize the app so it runs better and stuff

.github/workflows/python-package.yml

@@ -27,13 +27,8 @@ jobs:
  - name: Install dependencies
  run: |
  python -m pip install --upgrade pip
- python -m pip install flake8 pytest pyqt5 requests
- - name: Lint with flake8
+ python -m pip install pyqt5 requests pyinstaller
+ - name: Build with pyinstaller
  run: |
- # stop the build if there are Python syntax errors or undefined names
- flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics
- # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide
- flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
- - name: Test with pytest
- run: |
- pytest naticord.py
+ pyinstaller --noconsole naticord.py
+

naticord.py

@@ -1,6 +1,7 @@
 import sys
 import requests
 import configparser
+import os
 from PyQt5.QtWidgets import QApplication, QWidget, QVBoxLayout, QHBoxLayout, QLabel, QListWidget, QTextEdit, QLineEdit, QPushButton, QTabWidget, QMessageBox, QDialog, QListWidgetItem
 from PyQt5.QtCore import Qt, QTimer
 
@@ -11,7 +12,7 @@ def __init__(self):
  self.layout = QVBoxLayout()
 
  self.token_input = QLineEdit()
- self.token_input.setPlaceholderText("Enter your Discord token...")
+ self.token_input.setPlaceholderText("Enter your Discord token...") # set placeholder text for token input
  self.layout.addWidget(self.token_input)
 
  self.login_button = QPushButton("Login")
@@ -25,7 +26,8 @@ def login(self):
  if token:
  config = configparser.ConfigParser()
  config['Auth'] = {'Token': token}
- with open('config.ini', 'w') as configfile:
+ config_path = os.path.join(os.path.expanduser("~"), "config.ini") # save config.ini to user's home directory
+ with open(config_path, 'w') as configfile:
  config.write(configfile)
  self.accept()
  else:
@@ -38,60 +40,81 @@ def __init__(self):
  self.layout = QHBoxLayout()
  self.setLayout(self.layout)
 
+ # left panel containing user info, friends, and servers tabs
  self.left_panel = QWidget()
  self.left_panel_layout = QVBoxLayout()
  self.left_panel.setLayout(self.left_panel_layout)
 
+ # initialize friends and servers tabs
  self.friends_tab = QWidget()
  self.servers_tab = QWidget()
 
+ # initialize QTabWidget to contain friends and servers tabs
  self.tabs = QTabWidget()
  self.tabs.addTab(self.friends_tab, "Friends")
  self.tabs.addTab(self.servers_tab, "Servers")
 
+ # layouts for friends and servers tabs
  self.friends_layout = QVBoxLayout(self.friends_tab)
  self.servers_layout = QVBoxLayout(self.servers_tab)
 
+ # labels for user info, friends, and servers
  self.user_info_label = QLabel("User Info")
  self.friends_label = QLabel("Friends")
  self.servers_label = QLabel("Servers")
 
+ # list widgets to display friends and servers
  self.friends_list = QListWidget()
  self.servers_list = QListWidget()
 
+ # add labels and list widgets to layouts
  self.friends_layout.addWidget(self.friends_label)
  self.friends_layout.addWidget(self.friends_list)
 
  self.servers_layout.addWidget(self.servers_label)
  self.servers_layout.addWidget(self.servers_list)
 
+ # add user info label and tabs
  self.left_panel_layout.addWidget(self.user_info_label)
  self.left_panel_layout.addWidget(self.tabs)
 
+ # add left panel to main layout
  self.layout.addWidget(self.left_panel)
 
+ # right panel containing messages display and message input
  self.right_panel = QWidget()
  self.right_panel_layout = QVBoxLayout()
  self.right_panel.setLayout(self.right_panel_layout)
 
+ # label for messages
  self.messages_label = QLabel("Messages")
  self.right_panel_layout.addWidget(self.messages_label)
 
+ # text edit to display messages
  self.messages_text_edit = QTextEdit()
  self.right_panel_layout.addWidget(self.messages_text_edit)
 
+ # line edit for typing messages
  self.message_input = QLineEdit()
  self.message_input.returnPressed.connect(self.send_message)
  self.right_panel_layout.addWidget(self.message_input)
 
+ # add right panel to main layout
  self.layout.addWidget(self.right_panel)
 
+ # search bar for filtering lists
+ self.search_bar = QLineEdit()
+ self.search_bar.setPlaceholderText("Search...")
+ self.search_bar.textChanged.connect(self.filter_lists)
+
+ # retrieve Discord token from config.ini
  self.token = self.get_token()
  if not self.token:
  self.show_login_screen()
  else:
  self.load_data()
 
+ # start timer to refresh messages every 3 seconds
  self.refresh_timer = QTimer(self)
  self.refresh_timer.timeout.connect(self.refresh_messages)
  self.refresh_timer.start(3000)
@@ -106,7 +129,8 @@ def show_login_screen(self):
 
  def get_token(self):
  config = configparser.ConfigParser()
- config.read('config.ini')
+ config_path = os.path.join(os.path.expanduser("~"), "config.ini") # looks for config.ini in user dir
+ config.read(config_path)
  return config['Auth']['Token'] if 'Auth' in config and 'Token' in config['Auth'] else None
 
  def load_data(self):
@@ -128,13 +152,15 @@ def load_friends(self):
  response = requests.get("https://discord.com/api/v9/users/@me/channels", headers=headers)
  if response.status_code == 200:
  channels_data = response.json()
+ self.original_friends = [] # Store original items for filtering
  for channel in channels_data:
  recipients = channel.get("recipients", [])
  if recipients:
  friend_name = recipients[0].get("username", "Unknown")
  item = QListWidgetItem(friend_name)
  item.setData(Qt.UserRole, channel.get("id"))
  self.friends_list.addItem(item)
+ self.original_friends.append(item) # Add item to original list
  self.friends_list.itemDoubleClicked.connect(self.load_channel_messages)
  else:
  QMessageBox.warning(self, "Error", "Failed to fetch friends.")
@@ -144,11 +170,13 @@ def load_servers(self):
  response = requests.get("https://discord.com/api/v9/users/@me/guilds", headers=headers)
  if response.status_code == 200:
  servers_data = response.json()
+ self.original_servers = [] # Store original items for filtering
  for server in servers_data:
  server_name = server.get("name")
  item = QListWidgetItem(server_name)
  item.setData(Qt.UserRole, server.get("id"))
  self.servers_list.addItem(item)
+ self.original_servers.append(item) # Add item to original list
  self.servers_list.itemDoubleClicked.connect(self.load_server_channels)
  else:
  QMessageBox.warning(self, "Error", "Failed to fetch servers.")
@@ -185,10 +213,10 @@ def display_messages(self, messages):
  self.messages_text_edit.clear()
  for message in reversed(messages):
  author = message.get("author", {}).get("username", "Unknown")
- content = self.format_message_content(message.get("content", ""))
+ content = self.format_pings(message.get("content", ""))
  self.messages_text_edit.append(f"{author}: {content}")
 
- def format_message_content(self, content):
+ def format_pings(self, content):
  headers = {"Authorization": f"{self.token}"}
  while "<@!" in content:
  start_index = content.index("<@!")
@@ -262,6 +290,24 @@ def refresh_messages(self):
  elif selected_tab_index == 1:
  self.load_server_channels(selected_item)
 
+ def filter_lists(self):
+ # Get the current tab index
+ selected_tab_index = self.tabs.currentIndex()
+ # Clear the respective list widget
+ if selected_tab_index == 0:
+ list_widget = self.friends_list
+ original_items = self.original_friends.copy() # Make a copy of the original list
+ elif selected_tab_index == 1:
+ list_widget = self.servers_list
+ original_items = self.original_servers.copy() # Make a copy of the original list
+ list_widget.clear()
+ # Get the text from the search bar
+ search_text = self.search_bar.text().strip().lower()
+ # Iterate through the original items and add matching items to the filtered list
+ for item in original_items:
+ if search_text in item.text().lower():
+ list_widget.addItem(QListWidgetItem(item.text(), list_widget)) # Add a copy of the item
+
 if __name__ == "__main__":
  app = QApplication(sys.argv)
  client = Naticord()