feat: allow swapping the positions of the editor and language icons

lua/cord.lua

@@ -20,6 +20,7 @@ cord.config = {
     show_repository = true,
     show_cursor_position = false,
     swap_fields = false,
+    swap_icons = false,
     workspace_blacklist = {},
   },
   lsp = {
@@ -104,7 +105,8 @@ local function init(config)
       blacklist_arr,
       blacklist_len,
       vim.fn.getcwd(),
-      config.display.swap_fields
+      config.display.swap_fields,
+      config.display.swap_icons
     ),
     ffi.new(
       'Buttons',

lua/cord/utils.lua

@@ -48,7 +48,8 @@ local function init_discord(ffi)
       const char** workspace_blacklist;
       const int workspace_blacklist_len;
       const char* initial_path;
-      const bool swap;
+      const bool swap_fields;
+      const bool swap_icons;
     } InitArgs;
     typedef struct {
       const char* filename;

src/lib.rs

@@ -41,6 +41,7 @@ struct Config {
     workspace_blacklist: Vec<String>,
     buttons: Vec<ActivityButton>,
     swap_fields: bool,
+    swap_icons: bool,
 }
 
 #[repr(C)]
@@ -69,6 +70,7 @@ pub struct InitArgs {
     pub workspace_blacklist_len: i32,
     pub initial_path: *const c_char,
     pub swap_fields: bool,
+    pub swap_icons: bool,
 }
 
 #[repr(C)]
@@ -124,6 +126,7 @@ pub unsafe extern "C" fn init(
     let vcs_text = ptr_to_string(args.vcs_text);
     let workspace_text = ptr_to_string(args.workspace_text);
     let swap_fields = args.swap_fields;
+    let swap_icons = args.swap_icons;
     let workspace = find_workspace(&ptr_to_string(args.initial_path));
 
     let buttons = if buttons_ptr.is_null() {
@@ -182,6 +185,7 @@ pub unsafe extern "C" fn init(
                 workspace_blacklist,
                 buttons,
                 swap_fields,
+                swap_icons,
             });
             INITIALIZED = true;
         };
@@ -241,6 +245,7 @@ pub unsafe extern "C" fn update_presence(
             args.problem_count,
             START_TIME.as_ref(),
             config.swap_fields,
+            config.swap_icons,
         );
 
         config
@@ -444,6 +449,7 @@ pub unsafe extern "C" fn update_presence_with_assets(
             args.problem_count,
             START_TIME.as_ref(),
             config.swap_fields,
+            config.swap_icons,
         );
 
         config

src/util/utils.rs

@@ -119,6 +119,7 @@ pub fn build_activity(
     problem_count: i32,
     timestamp: Option<&u128>,
     swap_fields: bool,
+    swap_icons: bool,
 ) -> Activity {
     let (state, details) = if filetype == "Cord.idle" {
         (Some(details), None)
@@ -134,16 +135,24 @@ pub fn build_activity(
         )
     };
 
+    let (large_image, small_image) = if large_image.is_some() {
+        if swap_icons {
+            (Some(config.editor_image.clone()), large_image)
+        } else {
+            (large_image, Some(config.editor_image.clone()))
+        }
+    } else {
+        (Some(config.editor_image.clone()), None)
+    };
+
     Activity {
         state,
         details,
         assets: Some(ActivityAssets {
-            small_image: (large_image.is_some())
-                .then(|| config.editor_image.clone()),
+            small_image,
             small_text: (!config.editor_tooltip.is_empty())
                 .then(|| config.editor_tooltip.clone()),
-            large_image: large_image
-                .or_else(|| Some(config.editor_image.clone())),
+            large_image,
             large_text: Some(
                 large_text
                     .len()