Merge remote-tracking branch 'origin/emoji-reactions' into main

Author: plexus

bin/update_emoji_json

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+wget https://raw.githubusercontent.com/github/gemoji/master/db/emoji.json -O resources/emojis.json

profiles/dev/user.clj

@@ -1,6 +1,9 @@
 (ns user
   (:require [reloaded.repl :as reloaded]))
 
+(alter-var-root #'*print-namespace-maps* (constantly false))
+;; (set! *print-namespace-maps* false)
+
 (defmacro jit [sym]
   `(or (resolve '~sym)
        (do

repl/reactions.clj

@@ -0,0 +1,109 @@
+(ns repl.reactions
+  (:require [clojurians-log.application :as app]
+            [clojure.java.io :as io]
+            [clojurians-log.slack-api :as slack]
+            [clojurians-log.db.queries :as q]
+            [clojurians-log.db.import :as import]
+            [clojurians-log.data :as data]
+            [clj-slack.emoji :as slack-emoji]
+            [clojure.java.io :as io]
+            [clojurians-log.datomic :as d]
+            [clojure.tools.reader.edn :as edn]
+            [clojure.string :as str]
+            [clojure.core.async :as async :refer [>!! <! >! go-loop go <!!]]
+            [clojure.data.json :as json])
+  (:use [clojurians-log.repl]))
+
+(d/q '[:find (pull ?m [* {:reaction/_message [{:reaction/emoji [:emoji/shortcode :emoji/url]}]}])
+        :where
+        ;; [?u :user/name "borkdude"]
+        ;; [?m :message/day "2018-02-08"]
+        [?m :message/channel ?chan]
+        [?chan :channel/name "announcements"]]
+      (db))
+
+(q/channel-day-messages (db) "aleph" "2018-02-08")
+
+(d/q '[:find (pull ?r [*]) (pull ?m [*])
+       :where
+       [?u :user/name "borkdude"]
+       [?m :message/day "2018-02-08"]
+       [?m :message/channel ?chan]
+       [?chan :channel/name "aleph"]
+       [?r :reaction/message ?m]]
+     (db))
+
+(d/q '[:find ?m ?r
+       :where
+       [?r :reaction/message ?m]]
+     (db))
+
+(d/q '[:find (pull ?r [*])
+       :where
+       [?r :reaction/type]]
+     (db))
+
+;; find a message by key
+(d/q '[:find (pull ?m [*])
+       :where
+       [?m :message/key "C0E1SN0NM--1604347443.149900"]]
+     (db))
+
+
+(comment
+  ;; add some emojis
+  (d/transact (conn) [{:emoji/shortcode "+1" :emoji/url "url1"}])
+  (d/transact (conn) [{:emoji/shortcode "joy" :emoji/url "url1"}])
+  (d/q '[:find (pull ?e [*]) :where [?e :emoji/shortcode]] (db))
+  (d/q '[:find (pull ?e [*]) :where [?e :emoji/shortcode "sheepy"]] (db))
+  
+  ;; add default emojis
+  (def default-emojis
+    (with-open [r (io/reader (io/resource "emojis.json"))]
+      (let [emoji-list (-> (json/read r :key-fn keyword) :emojis)]
+        (map #(hash-map :emoji/shortcode (:name %)) emoji-list))))
+  
+  (def emlist (with-open [r (io/reader (io/resource "emojis.json"))]
+                (let [emoji-list (-> (json/read r :key-fn keyword))]
+                  emoji-list)))
+  
+
+  (into {} (map (comp first #(for [alias (:aliases %)] [alias (:emoji %)])) emlist))
+  
+  (d/transact (conn) default-emojis)
+  (d/q '[:find (pull ?e [*]) :where [?e :emoji/shortcode]] (db))
+  
+  (def emcoll (slack-emoji/list {:api-url "https://slack.com/api"
+   ;; TODO: get rid of this global config access
+                                 :token ""}))
+  
+  (doseq [emojis (partition-all 1000 (:emoji emcoll))]
+    @(d/transact (conn) (mapv import/emoji->tx emojis)))
+  
+  (load-demo-data! "../clojurians-log-demo-data2")
+  )
+
+(comment
+  (d/q '[:find ?eid :in $ ?eid :where [?eid]] (db) 17592186091857))
+
+(comment
+  (d/transact (conn) [{:db/id 17592186091852 :emoji/shortcode "joy" :emoji/url "url1"}])
+
+  (d/transact (conn) [{:db/ident       :emoji/shortcode
+                       :db/index true}])
+
+  (d/transact (conn) [{:db/ident       :emoji/shortcode
+                       :db/unique      :db.unique/identity}])
+
+  (d/transact (conn) [{:reaction/type "reaction_added"
+                       :reaction/emoji [:emoji/shortcode "+1"]
+                       :reaction/ts "1001"
+                       :reaction/user [:user/name "plexus"]
+                       :reaction/message [:message/key "C0G922PCH--1518108773.000057"]}])
+  
+  (d/q '[:find (pull ?m [*])
+         :where
+         [?m :message/key "C0G922PCH--1518108773.000057"]]
+       (db)))
+
+

resources/emojis.json

@@ -18,7 +18,7 @@
   {:pre [(string? ts) (string? channel)]}
   (str channel "--" ts))
 
-(defmulti event->tx :subtype)
+(defmulti event->tx (juxt :type :subtype))
 
 (defmethod event->tx :default [_]
   ;; return nil by default, this will let us skip events we don't (yet) care
@@ -44,20 +44,20 @@
                            :thread-inst (jt/to-java-date thread-inst)
                            :day         (time-util/format-inst-day thread-inst)}))))))
 
-(defmethod event->tx nil [message]
+(defmethod event->tx ["message" nil] [message]
   (message->tx message))
 
-(defmethod event->tx "message_deleted" [{:keys [deleted_ts channel] :as message}]
+(defmethod event->tx ["message" "message_deleted"] [{:keys [deleted_ts channel] :as message}]
   [(if d/cloud?
      :db/retractEntity
      :db.fn/retractEntity) [:message/key (message-key {:channel channel :ts deleted_ts})]])
 
-(defmethod event->tx "message_changed" [{:keys [message channel]}]
+(defmethod event->tx ["message" "message_changed"] [{:keys [message channel]}]
   (event->tx (assoc message :channel channel)))
 
 ;; Thread replies which are copied to the channel. For now we only include them
 ;; in the thread.
-(defmethod event->tx "thread_broadcast" [message]
+(defmethod event->tx ["message" "thread_broadcast"] [message]
   (message->tx message))
 
 (defn user->tx [{:keys [id name real_name is_admin is_owner profile]}]
@@ -94,6 +94,19 @@
   #:emoji {:shortcode (name shortcode)
            :url       url})
 
+(defmethod event->tx ["reaction_added" nil] [{:keys [user item reaction item_user event_ts ts]}]
+  {:reaction/type "reaction_added"
+   :reaction/emoji {:emoji/shortcode reaction}
+   :reaction/ts ts
+   :reaction/user [:user/slack-id user]
+   :reaction/message {:message/key (message-key item)}})
+
+(defmethod event->tx ["reaction_removed" nil] [{:keys [user item reaction item_user event_ts ts]}]
+  ;; Placeholder just to show that we're getting some data.
+  ;; TODO: return Datomic transaction data to retract a reaction entity
+  (println "-" reaction)
+  nil)
+
 (defn lines-reducible [^BufferedReader rdr]
   (reify clojure.lang.IReduceInit
     (reduce [this f init]

src/clojurians_log/db/import.clj

@@ -52,6 +52,8 @@
          [:message/text
           :message/ts
           :message/thread-ts
+          {:reaction/_message [:reaction/user 
+                               :reaction/type {:reaction/emoji [*]}]}
           {:message/user [:user/name
                           :user/slack-id
                           :user-profile/real-name