From 51fba995c3824e0f1a9be7ee3b326f1365d115d9 Mon Sep 17 00:00:00 2001
From: Adam R Grey <git@adamrgrey.com>
Date: Mon, 5 Jun 2023 15:25:43 -0400
Subject: [PATCH] log attachments

---
 DiscordInterface/DiscordInterface.cs | 36 ++++++++++++++--------------
 Models/User.cs                       | 11 ---------
 2 files changed, 18 insertions(+), 29 deletions(-)

diff --git a/DiscordInterface/DiscordInterface.cs b/DiscordInterface/DiscordInterface.cs
index 3c9cb42..ea62a0c 100644
--- a/DiscordInterface/DiscordInterface.cs
+++ b/DiscordInterface/DiscordInterface.cs
@@ -82,7 +82,7 @@ public class DiscordInterface
         if (suMessage == null)
         {
             Console.WriteLine($"{messageParam.Content}, but not a user message");
-             return;
+            return;
         }
         Console.WriteLine($"#{suMessage.Channel}[{DateTime.Now}][{suMessage.Author.Username} [id={suMessage.Author.Id}]][msg id: {suMessage.Id}] {suMessage.Content}");
 
@@ -94,13 +94,14 @@ public class DiscordInterface
             m.MentionsMe = true;
         }
 
-        if((suMessage.Author.Id != client.CurrentUser.Id)){
-        if (await thingmanagementdoer.Instance.ActOn(m))
+        if ((suMessage.Author.Id != client.CurrentUser.Id))
         {
-            m.ActedOn = true;
-            Console.WriteLine("survived a savechanges: 103");
+            if (await thingmanagementdoer.Instance.ActOn(m))
+            {
+                m.ActedOn = true;
+                Console.WriteLine("survived a savechanges: 103");
+            }
         }
-    }
         _db.SaveChanges();
     }
 
@@ -171,17 +172,23 @@ public class DiscordInterface
 
     internal vassago.Models.Attachment UpsertAttachment(IAttachment dAttachment)
     {
+        var addPlease = false;
         var a = _db.Attachments.FirstOrDefault(ai => ai.ExternalId == dAttachment.Id);
         if (a == null)
         {
-            var creating = _db.Attachments.Add(new vassago.Models.Attachment());
-            a = creating.Entity;
+            addPlease = true;
+            a = new vassago.Models.Attachment();
         }
         a.ContentType = dAttachment.ContentType;
         a.Description = dAttachment.Description;
         a.Filename = dAttachment.Filename;
         a.Size = dAttachment.Size;
         a.Source = new Uri(dAttachment.Url);
+
+        if (addPlease)
+        {
+            _db.Attachments.Add(a);
+        }
         return a;
     }
 
@@ -194,12 +201,7 @@ public class DiscordInterface
             addPlease = true;
             m = new Message();
         }
-
-        if (m == null)
-        {
-            var creating = _db.Messages.Add(new Message() { Author = null, Channel = null });
-            m = creating.Entity;
-        }
+        m.Attachments = m.Attachments ?? new List<vassago.Models.Attachment>();
         if (dMessage.Attachments?.Any() == true)
         {
             m.Attachments = new List<vassago.Models.Attachment>();
@@ -208,12 +210,10 @@ public class DiscordInterface
                 m.Attachments.Add(UpsertAttachment(da));
             }
         }
-        //m.Attachments = new List<
         m.Author = UpsertUser(dMessage.Author);
         m.Channel = UpsertChannel(dMessage.Channel);
         m.Content = dMessage.Content;
         m.ExternalId = dMessage.Id;
-        //m.ExternalRepresentation
         m.Timestamp = dMessage.EditedTimestamp ?? dMessage.CreatedAt;
 
         if (dMessage.MentionedUserIds?.FirstOrDefault(muid => muid == client.CurrentUser.Id) != null)
@@ -225,8 +225,8 @@ public class DiscordInterface
             _db.Messages.Add(m);
         }
 
-        m.Reply = (t) => {return dMessage.ReplyAsync(t);};
-        m.React = (e) => {return dMessage.AddReactionAsync(Emote.Parse(e));};
+        m.Reply = (t) => { return dMessage.ReplyAsync(t); };
+        m.React = (e) => { return dMessage.AddReactionAsync(Emote.Parse(e)); };
         return m;
     }
     internal Channel UpsertChannel(IMessageChannel channel)
diff --git a/Models/User.cs b/Models/User.cs
index 1dab81b..0599660 100644
--- a/Models/User.cs
+++ b/Models/User.cs
@@ -14,15 +14,4 @@ public class User //more like "user's account - no concept of the person outside
     public bool IsBot { get; set; } //webhook counts
     public Channel SeenInChannel { get; set; }
     public string Protocol { get; set; }
-    
-    public User(){}
-    public User(User u)
-    {
-        Type t = typeof(User);
-        PropertyInfo[] properties = t.GetProperties();
-        foreach (PropertyInfo pi in properties)
-        {
-            pi.SetValue(this, pi.GetValue(u, null), null);
-        }
-    }
 }
\ No newline at end of file