fix: message publishing

awakari · Aug 8, 2024 · c440dcd · c440dcd
1 parent 18237ef
commit c440dcd
Show file tree

Hide file tree

Showing 8 changed files with 22 additions and 22 deletions.
diff --git a/web/api/events.js b/web/api/events.js
@@ -4,10 +4,7 @@ const Events = {
 
 // uuidv4
 Events.newId = function () {
-    return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function(c) {
-        var r = Math.random() * 16 | 0, v = c == 'x' ? r : (r & 0x3 | 0x8);
-        return v.toString(16);
-    });
+    return Ksuid.generate();
 }
 
 Events.publishInternal = function (payload, headers) {

diff --git a/web/index.html b/web/index.html
@@ -157,6 +157,7 @@
     <script src="auth.js"></script>
     <script src="donation.js"></script>
     <script src="api/events.js"></script>
+    <script src="xksuid.js"></script>
     <script src="intcomm.js"></script>
     <script src="jquery-3.7.1.min.js"></script>
     <script src="api/response.js"></script>

diff --git a/web/intcomm.js b/web/intcomm.js
@@ -195,19 +195,16 @@ async function reportPublicationInappropriate(srcAddr, evtLink, evtId) {
                         ce_string: reason,
                     },
                     action: {
-                        ce_string: "report",
+                        ce_string: "Flag", // see for example: https://docs.joinmastodon.org/spec/activitypub/#Flag
                     },
                     object: {
-                        ce_string: evtId,
-                    },
-                    objecturl: {
                         ce_uri: evtLink,
                     },
                     subject: {
                         ce_string: userIdCurrent,
                     },
                 },
-                text_data: `User ${userIdCurrent} reports the inappropriate message from ${srcAddr}, reason: ${reason}`,
+                text_data: `User ${userIdCurrent} reports the inappropriate message ${evtId} from ${srcAddr}, reason: ${reason}`,
             }
             const headers = getAuthHeaders();
             if (await Events.publishInternal(payload, headers)) {

diff --git a/web/pub-msg.html b/web/pub-msg.html
@@ -18,6 +18,7 @@
     <script src="api/status.js"></script>
     <script src="attrs.js"></script>
     <script src="api/events.js"></script>
+    <script src="xksuid.js"></script>
     <script src="intcomm.js"></script>
     <script src="pub-msg.js"></script>
 

diff --git a/web/pub-src-details.html b/web/pub-src-details.html
@@ -15,6 +15,7 @@
 
     <script src="api/response.js"></script>
     <script src="auth.js"></script>
+    <script src="xksuid.js"></script>
     <script src="api/events.js"></script>
     <script src="intcomm.js"></script>
     <script src="api/sources.js"></script>

diff --git a/web/pub.html b/web/pub.html
@@ -40,6 +40,7 @@
     <script src="api/limits.js"></script>
     <script src="api/sources.js"></script>
     <script src="pub.js"></script>
+    <script src="xksuid.js"></script>
     <script src="api/events.js"></script>
     <script src="intcomm.js"></script>
     <script>

diff --git a/web/sub.html b/web/sub.html
@@ -37,6 +37,7 @@
 
     <script src="auth.js?v=1"></script>
     <script src="api/response.js"></script>
+    <script src="xksuid.js"></script>
     <script src="api/events.js"></script>
     <script src="intcomm.js"></script>
     <script src="api/subscriptions.js"></script>

diff --git a/web/xksuid.js b/web/xksuid.js
@@ -1,3 +1,4 @@
+const Ksuid = {}
 //@ts-check
 
 /**
@@ -11,7 +12,7 @@ const BASE62 = '0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz'
  * @param {DataView} view
  * @returns {string}
  */
-export function base62(view) {
+Ksuid.base62 = function (view) {
     if (view.byteLength !== 20) {
         throw new Error("incorrect buffer size")
     }
@@ -58,7 +59,7 @@ export function base62(view) {
  * @param {string} str
  * @returns {Uint8Array} buffer
  */
-export function debase62(str) {
+Ksuid.debase62 = function (str) {
     if (str.length !== 27) throw new Error('Expected 27 characters long base62 string')
     const srcBase = 62n
     const dstBase = 4294967296n
@@ -120,7 +121,7 @@ export function debase62(str) {
  * @param {boolean|undefined} desc order, `true` indicates xKSUID
  * @returns {number} seconds
  */
-export function toEpoch(timestamp, desc) {
+Ksuid.toEpoch = function (timestamp, desc) {
     if (!desc) {
         return Math.round(timestamp / 1000) - 14e8
     }
@@ -134,7 +135,7 @@ export function toEpoch(timestamp, desc) {
  * @param {boolean|undefined} desc
  * @returns {number} ms
  */
-export function fromEpoch(timestamp, desc) {
+Ksuid.fromEpoch = function (timestamp, desc) {
     if (!desc) {
         return (14e8 + timestamp) * 1000
     }
@@ -145,7 +146,7 @@ export function fromEpoch(timestamp, desc) {
  * Generates cryptographically strong random buffer
  * @returns {Uint8Array} 16 bytes of random binary values
  */
-export function randomBytes() {
+Ksuid.randomBytes = function () {
     return crypto.getRandomValues(new Uint8Array(16))
 }
 
@@ -155,37 +156,37 @@ export function randomBytes() {
  * @param {number} timestamp ms
  * @returns {string} 27 chars KSUID or 28 chars for xKSUID
  */
-export function generate(desc = false, timestamp = Date.now()) {
+Ksuid.generate = function (desc = false, timestamp = Date.now()) {
     const buf = new ArrayBuffer(20)
     const view = new DataView(buf)
-    const ts = toEpoch(timestamp, desc)
+    const ts = Ksuid.toEpoch(timestamp, desc)
     let offset = 0
     view.setUint32(offset, ts, false)
     offset += 4
-    const rnd = randomBytes()
+    const rnd = Ksuid.randomBytes()
     for (const b of rnd) {
         view.setUint8(offset++, b)
     }
-    if (desc) return 'z' + base62(view)
-    return base62(view)
+    if (desc) return 'z' + Ksuid.base62(view)
+    return Ksuid.base62(view)
 }
 
 /**
  * Parses (x)KSUID string to timestamp and random part
  * @param {string} ksuid
  * @return {{ts:Date,rnd:ArrayBuffer}} parsed value
  */
-export function parse(ksuid) {
+Ksuid.parse = function (ksuid) {
     if (ksuid.length > 28 || ksuid.length < 27) {
         throw new Error(`Incorrect length: ${ksuid.length}, expected 27 or 28`)
     }
     const desc = ksuid.length === 28 && ksuid[0] == 'z'
     if (ksuid.length === 28 && ksuid[0] != 'z') {
         throw new Error(`KSUID is 28 symbol, but first char is not "z"`)
     }
-    const buf = debase62(desc ? ksuid.slice(1, 28) : ksuid)
+    const buf = Ksuid.debase62(desc ? ksuid.slice(1, 28) : ksuid)
     const view = new DataView(buf.buffer)
     const tsValue = view.getUint32(0, false)
-    const ts = new Date(fromEpoch(tsValue, desc))
+    const ts = new Date(Ksuid.fromEpoch(tsValue, desc))
     return { ts, rnd: buf.buffer.slice(4) }
 }