dnitza/adamantium
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add emoji to statuses

Browse Source
This commit is contained in:
Daniel Nitsikopoulos
2024-03-24 17:24:48 +11:00
parent adb84e0d73
commit 2b1363294b
11 changed files with 99 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
db/migrate/20240324053509_add_emoji_to_posts.rb Normal file
View File

@@ -0,0 +1,9 @@
# frozen_string_literal: true
ROM::SQL.migration do
change do
alter_table :posts do
add_column :emoji, :text
end
end
end

18
slices/main/actions/feeds/statuses_json.rb Normal file
View File

@@ -0,0 +1,18 @@
module Main
module Actions
module Feeds
class StatusesJSON < Action
include Deps["views.feeds.statuses_json", "repos.post_repo"]
def handle(req, res)
posts = post_repo.statuses_for_rss.map do |post|
Decorators::Posts::Decorator.new(post).to_h
end
res.content_type = "application/json; charset=utf-8"
res.body = JSON.generate(posts, quirks_mode: true)
end
end
end
end
end

2
slices/main/config/routes.rb
View File

@@ -24,6 +24,8 @@ module Main
get "/feeds/rss", to: "feeds.rss"
get "/feeds/statuses_rss", to: "feeds.statuses_rss"
get "/feeds/statuses_json", to: "feeds.statuses_json"
get "/more", to: "more.index"
get "/hikes", to: "workouts.index"

21
slices/main/decorators/posts/decorator.rb
View File

@@ -53,11 +53,23 @@ module Main
doc.at("//img")
end
def inline_image_sources
inline_images
&.select {|attr, _value| attr == "src"}
&.map {|img| img[1] } || []
end
def photo_sources
photos.map{|photo| photo["value"]}
end
def prefix_emoji
if name
nil
elsif photos? && content == ""
"📷"
elsif __getobj__.emoji
__getobj__.emoji
else
@prefix_emoji ||= if (match = content.match(Unicode::Emoji::REGEX))
match
@@ -133,6 +145,15 @@ module Main
__getobj__.trips
end
def to_h
{
id: slug,
emoji: prefix_emoji,
content: raw_content,
images: (inline_image_sources + photo_sources).compact
}
end
private
# e.g. geo:-37.75188,144.90417;u=35

0
slices/main/templates/feeds/statuses_json.json.builder Normal file
View File

21
slices/main/views/feeds/statuses_json.rb Normal file
View File

@@ -0,0 +1,21 @@
require "builder"
module Main
module Views
module Feeds
class StatusesJSON < Main::View
include Deps["repos.post_repo"]
expose :posts do
post_repo.statuses_for_rss.map do |post|
Decorators::Posts::Decorator.new post
end
end
expose :json, decorate: false, layout: true do |posts|
posts.to_json
end
end
end
end
end

1
slices/micropub/entities/post_request.rb
View File

@@ -11,6 +11,7 @@ module Micropub
attribute :post_type, Types::Coercible::String
attribute :syndicate_to, Types::Array.of(Types::Coercible::String)
attribute :in_reply_to, Types::Coercible::String
attribute :emoji, Types::Coercible::String
attribute :photos, Types::Array.of(Types::Hash)
attribute :location, Types::Coercible::String.optional
end

2
slices/micropub/request_parser.rb
View File

@@ -98,6 +98,7 @@ module Micropub
slug: params[:slug] || params[:"mp-slug"],
syndicate_to: Array(params[:properties][:"mp-syndicate-to"]) || [],
in_reply_to: params[:properties][:"in-reply-to"] || nil,
emoji: params[:properties][:emoji] || nil,
photos: photos,
location: params[:properties][:location]
})
@@ -121,6 +122,7 @@ module Micropub
new_params.merge({
syndicate_to: Array(params[:"mp-syndicate-to"]) || [],
in_reply_to: params[:"in-reply-to"],
emoji: params[:emoji],
name: params[:name],
slug: params[:slug] || params[:"mp-slug"],
published_at: (params[:"post-status"] == "draft") ? nil : publish_time,

1
slices/micropub/validation/posts/post_contract.rb
View File

@@ -13,6 +13,7 @@ module Micropub
required(:photos).array(:hash)
required(:location).maybe(:string)
required(:in_reply_to).maybe(:string)
required(:emoji).maybe(:string)
end
end
end

42
spec/requests/create_webmention_spec.rb
View File

@@ -7,26 +7,28 @@ RSpec.describe "Webmention creation", :db, :requests do
context "reply" do
let(:reply_json) {
{
type: "entry",
author: {
type: "card",
name: "nitza",
photo: "",
url: "https://micro.blog/nitza"
},
url: "https://micro.blog/nitza/20554783",
published: "2023-07-05T09:44:41+00:00",
"wm-received": "2023-07-05T09:44:48Z",
"wm-id": 1692950,
"wm-source": "https://micro.blog/nitza/20554783",
"wm-target": "https://dnitza.com/post/#{post_record.slug}",
content: {
html: "<p><a href=\"https://micro.blog/example\">@example</a> hah! I thought the same thing — but this is the most affordable thing that Teenage Engineering makes 😅</p>",
text: "@example hah! I thought the same thing — but this is the most affordable thing that Teenage Engineering makes 😅"
},
"in-reply-to": "https://dnitza.com/post/#{post_record.slug}",
"wm-property": "in-reply-to",
"wm-private": false
post: {
type: "entry",
author: {
type: "card",
name: "nitza",
photo: "",
url: "https://micro.blog/nitza"
},
url: "https://micro.blog/nitza/20554783",
published: "2023-07-05T09:44:41+00:00",
"wm-received": "2023-07-05T09:44:48Z",
"wm-id": 1692950,
"wm-source": "https://micro.blog/nitza/20554783",
"wm-target": "https://dnitza.com/post/#{post_record.slug}",
content: {
html: "<p><a href=\"https://micro.blog/example\">@example</a> hah! I thought the same thing — but this is the most affordable thing that Teenage Engineering makes 😅</p>",
text: "@example hah! I thought the same thing — but this is the most affordable thing that Teenage Engineering makes 😅"
},
"in-reply-to": "https://dnitza.com/post/#{post_record.slug}",
"wm-property": "in-reply-to",
"wm-private": false
}
}
}

3
spec/syndication/unit/mastodon_spec.rb
View File

@@ -21,7 +21,8 @@ RSpec.describe Adamantium::Syndication::Mastodon do
syndicate_to: [],
photos: [],
location: nil,
in_reply_to: nil
in_reply_to: nil,
emoji: nil
)
}