diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index e3a16a4c..69f6b4d7 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -9,10 +9,10 @@ jobs:
steps:
- uses: actions/checkout@v2
- - name: Set up JDK 15
+ - name: Set up JDK 17
uses: actions/setup-java@v1
with:
- java-version: 15
+ java-version: 17
- name: Cache Maven dependencies
uses: actions/cache@v1
with:
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
index 02b69546..27aa75ed 100644
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ b/.idea/inspectionProfiles/Project_Default.xml
@@ -3,11 +3,5 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/Dockerfile b/Dockerfile
index b208f523..3b514165 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,13 +1,11 @@
-FROM maven:3.6.3-openjdk-15 as builder
+FROM maven:3.8.3-eclipse-temurin-17 as builder
WORKDIR /usr/src/app
-COPY pom.xml .
-RUN mvn dependency:go-offline
COPY . .
-RUN mvn package
+RUN mvn package -DskipTests=true
RUN java LibVipsDownloader.java
-FROM openjdk:15-buster
+FROM eclipse-temurin:17-jdk
SHELL ["bash", "-c"]
RUN mkdir -p /opt/smithereen
diff --git a/README.md b/README.md
index 226e0f34..152930df 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,7 @@
# Smithereen
+[](https://crowdin.com/project/smithereen)
+
Federated, ActivityPub-compatible social network with friends, walls, and groups.
If you have any questions or feedback, there's a [Telegram chat](https://t.me/SmithereenProject) you can join.
@@ -9,8 +11,8 @@ If you have any questions or feedback, there's a [Telegram chat](https://t.me/Sm
### Running directly on your server
1. Install and configure MySQL
-2. Install maven and JDK >=15 if you don't have it already
-3. Build the jar by running `mvn package` and place the one with dependencies at `/opt/smithereen/smithereen.jar`
+2. Install maven and JDK >=17 if you don't have it already
+3. Build the jar by running `mvn package -DskipTests=true` and place the one with dependencies at `/opt/smithereen/smithereen.jar`
4. Set up the image processing native library ([libvips](https://github.com/libvips/libvips)): run `java LibVipsDownloader.java` to automatically download a prebuilt one from [here](https://github.com/lovell/sharp-libvips). If you already have libvips installed on your system, you may skip this step, but be aware that not all libvips builds include all the features Smithereen needs.
5. Install and configure [imgproxy](https://docs.imgproxy.net/#/GETTING_STARTED)
6. Fill in the config file, see a commented example [here](examples/config.properties)
@@ -22,3 +24,7 @@ If you have any questions or feedback, there's a [Telegram chat](https://t.me/Sm
### Using Docker
Copy [Docker-specific config example](examples/config_docker.properties) to the project root directory as `config.properties` and edit it to set your domain. Also edit `docker-compose.yml` to add your imgproxy secrets. You can then use `docker-compose` to run Smithereen, MySQL, and imgproxy. You still need to [configure your web server to reverse proxy the port 4567](examples/nginx.conf). Create the first account by running `docker exec -it smithereen_web_1 bash -c ./smithereen-init-admin`.
+
+## Contributing
+
+If you would like to help translate Smithereen into your language, please [do so on Crowdin](https://crowdin.com/project/smithereen).
\ No newline at end of file
diff --git a/codegen/gen_inflection_rules.php b/codegen/gen_inflection_rules.php
index dda443c1..0c216002 100644
--- a/codegen/gen_inflection_rules.php
+++ b/codegen/gen_inflection_rules.php
@@ -21,22 +21,43 @@ function generateCases($cases){
$j[]="\t\t\treturn input;";
return;
}
- $j[]="\t\t\tswitch(_case){";
+ $removeCounts=[];
for($i=0;$i0)
+ $j[]="\t\t\treturn input.substring(0, input.length()-$commonRemoveCount)+switch(_case){";
+ elseif($commonRemoveCount==0)
+ $j[]="\t\t\treturn input+switch(_case){";
+ else
+ $j[]="\t\t\treturn switch(_case){";
+ for($i=0;$i{$key}->suffixes;
$j[]="\tpublic static String $method(String input, User.Gender gender, Inflector.Case _case, boolean firstWord){";
+ $j[]="\t\tif(_case==Inflector.Case.NOMINATIVE) return input;";
$j[]="\t\tString inputLower=input.toLowerCase();";
foreach($all as $gk=>$group){
foreach ($group as $ex) {
diff --git a/codegen/gender_ru.json b/codegen/gender_ru.json
index 9d152388..8efd0c56 100644
--- a/codegen/gender_ru.json
+++ b/codegen/gender_ru.json
@@ -51,7 +51,8 @@
"райхон",
"закия",
"захария",
- "женя"
+ "женя",
+ "карен"
],
"male": [
"абиба",
@@ -189,7 +190,8 @@
"костя",
"алья",
"илья",
- "ларья"
+ "ларья",
+ "артём"
],
"female": [
"судаба",
@@ -416,10 +418,7 @@
"ым",
"ям",
"ан",
- "бен",
- "вен",
- "ген",
- "ден",
+ "ен",
"ин",
"сейн",
"он",
diff --git a/codegen/inflect_ru.json b/codegen/inflect_ru.json
index 72cfedb2..eaecf38e 100644
--- a/codegen/inflect_ru.json
+++ b/codegen/inflect_ru.json
@@ -65,7 +65,8 @@
"долгопалец",
"маненок",
"рева",
- "кива"
+ "кива",
+ "щёлок"
],
"mods": [
".",
@@ -464,6 +465,7 @@
"gender": "male",
"test": [
"нец",
+ "мец",
"робец"
],
"mods": [
@@ -518,6 +520,7 @@
"gender": "male",
"test": [
"ах",
+ "ав",
"ив",
"шток"
],
@@ -633,6 +636,7 @@
"gender": "male",
"test": [
"вец",
+ "сец",
"убец",
"ырец"
],
@@ -1054,6 +1058,33 @@
"-е"
]
},
+ {
+ "gender": "male",
+ "test": [
+ "бек"
+ ],
+ "mods": [
+ "-ка",
+ "-ку",
+ "-ка",
+ "-ком",
+ "-ке"
+ ]
+ },
+ {
+ "gender": "male",
+ "test": [
+ "ек",
+ "ёк"
+ ],
+ "mods": [
+ "--ька",
+ "--ьку",
+ "--ька",
+ "--ьком",
+ "--ьке"
+ ]
+ },
{
"gender": "male",
"test": [
diff --git a/crowdin.yml b/crowdin.yml
new file mode 100644
index 00000000..61b27dd3
--- /dev/null
+++ b/crowdin.yml
@@ -0,0 +1,3 @@
+files:
+ - source: /src/main/resources/langs/en.json
+ translation: /src/main/resources/langs/%two_letters_code%.json
diff --git a/examples/nginx.conf b/examples/nginx.conf
index 2d9b5771..fac655be 100644
--- a/examples/nginx.conf
+++ b/examples/nginx.conf
@@ -9,8 +9,8 @@ server{
proxy_pass http://127.0.0.1:4560;
proxy_cache sm_images;
proxy_cache_lock on;
- proxy_ignore_headers Cache-Control;
- proxy_cache_valid any 3650d;
+ proxy_ignore_headers Cache-Control Expires;
+ proxy_cache_valid 3650d;
expires max;
}
location / {
diff --git a/pom.xml b/pom.xml
index 92e3a212..32c41bf6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,13 +6,15 @@
UTF-8
UTF-8
- 15
- 15
+ 17
+ 17
+ true
+
me.grishka.smithereen
server
- 0.3.0
+ 0.4.0
@@ -54,9 +56,6 @@
maven-surefire-plugin
3.0.0-M4
-
- true
-
@@ -115,7 +114,7 @@
https://repo1.maven.org/maven2/com/github/eirslett/frontend-maven-plugin/ -->
1.12.0
- v14.17.0
+ v16.13.1
src/main/web
target
@@ -235,24 +234,25 @@
io.pebbletemplates
pebble
- 3.1.4
+ 3.1.5
mysql
mysql-connector-java
+
8.0.18
org.jetbrains
annotations
- 19.0.0
+ 23.0.0
compile
org.jsoup
jsoup
- 1.14.2
+ 1.14.3
com.squareup.okhttp3
@@ -262,13 +262,13 @@
org.junit.jupiter
junit-jupiter
- 5.6.0
+ 5.8.2
test
org.slf4j
slf4j-simple
- 1.7.21
+ 1.7.36
javax.mail
@@ -278,7 +278,7 @@
com.google.code.gson
gson
- 2.8.6
+ 2.9.0
cz.jirutka.unidecode
@@ -288,7 +288,7 @@
net.java.dev.jna
jna
- 5.8.0
+ 5.11.0
diff --git a/schema.sql b/schema.sql
index b96ab47e..98b91bf9 100644
--- a/schema.sql
+++ b/schema.sql
@@ -1,37 +1,23 @@
-# ************************************************************
-# Sequel Ace SQL dump
-# Version 3041
-#
-# https://sequel-ace.com/
-# https://github.com/Sequel-Ace/Sequel-Ace
-#
-# Host: 127.0.0.1 (MySQL 5.7.9)
-# Database: smithereen
-# Generation Time: 2021-10-20 17:22:10 +0000
-# ************************************************************
-
-
-/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
-/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
-/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
-SET NAMES utf8mb4;
+-- MySQL dump 10.13 Distrib 8.0.27, for macos12.0 (arm64)
+--
+-- Host: localhost Database: smithereen
+-- ------------------------------------------------------
+-- Server version 8.0.27
/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
-/*!40101 SET @OLD_SQL_MODE='NO_AUTO_VALUE_ON_ZERO', SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
-/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
-
-# Dump of table accounts
-# ------------------------------------------------------------
+--
+-- Table structure for table `accounts`
+--
CREATE TABLE `accounts` (
- `id` int(11) unsigned NOT NULL AUTO_INCREMENT,
- `user_id` int(11) unsigned NOT NULL,
+ `id` int unsigned NOT NULL AUTO_INCREMENT,
+ `user_id` int unsigned NOT NULL,
`email` varchar(200) NOT NULL DEFAULT '',
`password` binary(32) DEFAULT NULL,
`created_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
- `invited_by` int(11) unsigned DEFAULT NULL,
- `access_level` tinyint(3) unsigned NOT NULL DEFAULT '1',
- `preferences` text CHARACTER SET utf8mb4 COLLATE utf8mb4_bin,
+ `invited_by` int unsigned DEFAULT NULL,
+ `access_level` tinyint unsigned NOT NULL DEFAULT '1',
+ `preferences` text,
`last_active` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
`ban_info` text,
PRIMARY KEY (`id`),
@@ -39,79 +25,73 @@ CREATE TABLE `accounts` (
CONSTRAINT `accounts_ibfk_1` FOREIGN KEY (`user_id`) REFERENCES `users` (`id`) ON DELETE CASCADE
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
-
-
-# Dump of table blocks_group_domain
-# ------------------------------------------------------------
+--
+-- Table structure for table `blocks_group_domain`
+--
CREATE TABLE `blocks_group_domain` (
- `owner_id` int(10) unsigned NOT NULL,
- `domain` varchar(100) CHARACTER SET ascii NOT NULL,
+ `owner_id` int unsigned NOT NULL,
+ `domain` varchar(100) CHARACTER SET ascii COLLATE ascii_general_ci NOT NULL,
UNIQUE KEY `owner_id` (`owner_id`,`domain`),
KEY `domain` (`domain`),
CONSTRAINT `blocks_group_domain_ibfk_1` FOREIGN KEY (`owner_id`) REFERENCES `groups` (`id`) ON DELETE CASCADE
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
-
-
-# Dump of table blocks_group_user
-# ------------------------------------------------------------
+--
+-- Table structure for table `blocks_group_user`
+--
CREATE TABLE `blocks_group_user` (
- `owner_id` int(10) unsigned NOT NULL,
- `user_id` int(10) unsigned NOT NULL,
+ `owner_id` int unsigned NOT NULL,
+ `user_id` int unsigned NOT NULL,
UNIQUE KEY `owner_id` (`owner_id`,`user_id`),
KEY `user_id` (`user_id`),
CONSTRAINT `blocks_group_user_ibfk_1` FOREIGN KEY (`owner_id`) REFERENCES `groups` (`id`) ON DELETE CASCADE,
CONSTRAINT `blocks_group_user_ibfk_2` FOREIGN KEY (`user_id`) REFERENCES `users` (`id`) ON DELETE CASCADE
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
-
-
-# Dump of table blocks_user_domain
-# ------------------------------------------------------------
+--
+-- Table structure for table `blocks_user_domain`
+--
CREATE TABLE `blocks_user_domain` (
- `owner_id` int(10) unsigned NOT NULL,
- `domain` varchar(100) CHARACTER SET ascii NOT NULL,
+ `owner_id` int unsigned NOT NULL,
+ `domain` varchar(100) CHARACTER SET ascii COLLATE ascii_general_ci NOT NULL,
UNIQUE KEY `owner_id` (`owner_id`,`domain`),
KEY `domain` (`domain`),
CONSTRAINT `blocks_user_domain_ibfk_1` FOREIGN KEY (`owner_id`) REFERENCES `users` (`id`) ON DELETE CASCADE
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
-
-
-# Dump of table blocks_user_user
-# ------------------------------------------------------------
+--
+-- Table structure for table `blocks_user_user`
+--
CREATE TABLE `blocks_user_user` (
- `owner_id` int(10) unsigned NOT NULL,
- `user_id` int(10) unsigned NOT NULL,
+ `owner_id` int unsigned NOT NULL,
+ `user_id` int unsigned NOT NULL,
UNIQUE KEY `owner_id` (`owner_id`,`user_id`),
KEY `user_id` (`user_id`),
CONSTRAINT `blocks_user_user_ibfk_1` FOREIGN KEY (`owner_id`) REFERENCES `users` (`id`) ON DELETE CASCADE,
CONSTRAINT `blocks_user_user_ibfk_2` FOREIGN KEY (`user_id`) REFERENCES `users` (`id`) ON DELETE CASCADE
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
-
-
-# Dump of table config
-# ------------------------------------------------------------
+--
+-- Table structure for table `config`
+--
CREATE TABLE `config` (
- `key` varchar(255) CHARACTER SET ascii NOT NULL DEFAULT '',
+ `key` varchar(255) CHARACTER SET ascii COLLATE ascii_general_ci NOT NULL DEFAULT '',
`value` text NOT NULL,
PRIMARY KEY (`key`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
-
-
-# Dump of table draft_attachments
-# ------------------------------------------------------------
+--
+-- Table structure for table `draft_attachments`
+--
CREATE TABLE `draft_attachments` (
`id` binary(16) NOT NULL,
- `owner_account_id` int(10) unsigned NOT NULL,
+ `owner_account_id` int unsigned NOT NULL,
`info` text NOT NULL,
`created` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
PRIMARY KEY (`id`),
@@ -119,15 +99,14 @@ CREATE TABLE `draft_attachments` (
CONSTRAINT `draft_attachments_ibfk_1` FOREIGN KEY (`owner_account_id`) REFERENCES `accounts` (`id`) ON DELETE CASCADE
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
-
-
-# Dump of table email_codes
-# ------------------------------------------------------------
+--
+-- Table structure for table `email_codes`
+--
CREATE TABLE `email_codes` (
`code` binary(64) NOT NULL,
- `account_id` int(10) unsigned DEFAULT NULL,
- `type` int(11) NOT NULL,
+ `account_id` int unsigned DEFAULT NULL,
+ `type` int NOT NULL,
`extra` text,
`created_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
PRIMARY KEY (`code`),
@@ -135,14 +114,13 @@ CREATE TABLE `email_codes` (
CONSTRAINT `email_codes_ibfk_1` FOREIGN KEY (`account_id`) REFERENCES `accounts` (`id`) ON DELETE CASCADE
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
-
-
-# Dump of table followings
-# ------------------------------------------------------------
+--
+-- Table structure for table `followings`
+--
CREATE TABLE `followings` (
- `follower_id` int(11) unsigned NOT NULL,
- `followee_id` int(11) unsigned NOT NULL,
+ `follower_id` int unsigned NOT NULL,
+ `followee_id` int unsigned NOT NULL,
`mutual` tinyint(1) NOT NULL DEFAULT '0',
`accepted` tinyint(1) NOT NULL DEFAULT '1',
KEY `follower_id` (`follower_id`),
@@ -153,131 +131,151 @@ CREATE TABLE `followings` (
CONSTRAINT `followings_ibfk_2` FOREIGN KEY (`followee_id`) REFERENCES `users` (`id`) ON DELETE CASCADE
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
-
-
-# Dump of table friend_requests
-# ------------------------------------------------------------
+--
+-- Table structure for table `friend_requests`
+--
CREATE TABLE `friend_requests` (
- `from_user_id` int(11) unsigned NOT NULL,
- `to_user_id` int(11) unsigned NOT NULL,
+ `id` int unsigned NOT NULL AUTO_INCREMENT,
+ `from_user_id` int unsigned NOT NULL,
+ `to_user_id` int unsigned NOT NULL,
`message` text,
+ PRIMARY KEY (`id`),
UNIQUE KEY `from_user_id` (`from_user_id`,`to_user_id`),
KEY `to_user_id` (`to_user_id`),
CONSTRAINT `friend_requests_ibfk_1` FOREIGN KEY (`from_user_id`) REFERENCES `users` (`id`) ON DELETE CASCADE,
CONSTRAINT `friend_requests_ibfk_2` FOREIGN KEY (`to_user_id`) REFERENCES `users` (`id`) ON DELETE CASCADE
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
-
-
-# Dump of table group_admins
-# ------------------------------------------------------------
+--
+-- Table structure for table `group_admins`
+--
CREATE TABLE `group_admins` (
- `user_id` int(11) unsigned NOT NULL,
- `group_id` int(11) unsigned NOT NULL,
- `level` int(11) unsigned NOT NULL,
+ `user_id` int unsigned NOT NULL,
+ `group_id` int unsigned NOT NULL,
+ `level` int unsigned NOT NULL,
`title` varchar(300) DEFAULT NULL,
- `display_order` int(10) unsigned NOT NULL DEFAULT '0',
+ `display_order` int unsigned NOT NULL DEFAULT '0',
KEY `user_id` (`user_id`),
KEY `group_id` (`group_id`),
CONSTRAINT `group_admins_ibfk_1` FOREIGN KEY (`user_id`) REFERENCES `users` (`id`) ON DELETE CASCADE,
CONSTRAINT `group_admins_ibfk_2` FOREIGN KEY (`group_id`) REFERENCES `groups` (`id`) ON DELETE CASCADE
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+--
+-- Table structure for table `group_invites`
+--
+CREATE TABLE `group_invites` (
+ `id` int unsigned NOT NULL AUTO_INCREMENT,
+ `inviter_id` int unsigned NOT NULL,
+ `invitee_id` int unsigned NOT NULL,
+ `group_id` int unsigned NOT NULL,
+ `time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
+ `is_event` tinyint(1) NOT NULL,
+ `ap_id` varchar(300) CHARACTER SET ascii COLLATE ascii_general_ci DEFAULT NULL,
+ PRIMARY KEY (`id`),
+ UNIQUE KEY `ap_id` (`ap_id`),
+ KEY `inviter_id` (`inviter_id`),
+ KEY `invitee_id` (`invitee_id`),
+ KEY `group_id` (`group_id`),
+ KEY `is_event` (`is_event`),
+ CONSTRAINT `group_invites_ibfk_1` FOREIGN KEY (`inviter_id`) REFERENCES `users` (`id`) ON DELETE CASCADE,
+ CONSTRAINT `group_invites_ibfk_2` FOREIGN KEY (`invitee_id`) REFERENCES `users` (`id`) ON DELETE CASCADE,
+ CONSTRAINT `group_invites_ibfk_3` FOREIGN KEY (`group_id`) REFERENCES `groups` (`id`) ON DELETE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
-# Dump of table group_memberships
-# ------------------------------------------------------------
+--
+-- Table structure for table `group_memberships`
+--
CREATE TABLE `group_memberships` (
- `user_id` int(11) unsigned NOT NULL,
- `group_id` int(11) unsigned NOT NULL,
- `post_feed_visibility` tinyint(4) unsigned NOT NULL DEFAULT '0',
+ `user_id` int unsigned NOT NULL,
+ `group_id` int unsigned NOT NULL,
+ `post_feed_visibility` tinyint unsigned NOT NULL DEFAULT '0',
`tentative` tinyint(1) NOT NULL DEFAULT '0',
`accepted` tinyint(1) NOT NULL DEFAULT '1',
+ `time` timestamp NULL DEFAULT CURRENT_TIMESTAMP,
UNIQUE KEY `user_id` (`user_id`,`group_id`),
KEY `group_id` (`group_id`),
CONSTRAINT `group_memberships_ibfk_1` FOREIGN KEY (`user_id`) REFERENCES `users` (`id`) ON DELETE CASCADE,
CONSTRAINT `group_memberships_ibfk_2` FOREIGN KEY (`group_id`) REFERENCES `groups` (`id`) ON DELETE CASCADE
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
-
-
-# Dump of table groups
-# ------------------------------------------------------------
+--
+-- Table structure for table `groups`
+--
CREATE TABLE `groups` (
- `id` int(11) unsigned NOT NULL AUTO_INCREMENT,
+ `id` int unsigned NOT NULL AUTO_INCREMENT,
`name` varchar(200) NOT NULL DEFAULT '',
`username` varchar(50) NOT NULL DEFAULT '',
`domain` varchar(100) NOT NULL DEFAULT '',
- `ap_id` varchar(300) CHARACTER SET ascii DEFAULT NULL,
+ `ap_id` varchar(300) CHARACTER SET ascii COLLATE ascii_general_ci DEFAULT NULL,
`ap_url` varchar(300) DEFAULT NULL,
`ap_inbox` varchar(300) DEFAULT NULL,
`ap_shared_inbox` varchar(300) DEFAULT NULL,
- `ap_outbox` varchar(300) DEFAULT NULL,
`public_key` blob NOT NULL,
`private_key` blob,
- `avatar` text,
+ `avatar` json DEFAULT NULL,
`about` text,
- `profile_fields` text,
+ `about_source` text,
+ `profile_fields` json DEFAULT NULL,
`event_start_time` timestamp NULL DEFAULT NULL,
`event_end_time` timestamp NULL DEFAULT NULL,
- `type` tinyint(3) unsigned NOT NULL DEFAULT '0',
- `member_count` int(10) unsigned NOT NULL DEFAULT '0',
- `tentative_member_count` int(10) unsigned NOT NULL DEFAULT '0',
- `ap_followers` varchar(300) DEFAULT NULL,
- `ap_wall` varchar(300) DEFAULT NULL,
+ `type` tinyint unsigned NOT NULL DEFAULT '0',
+ `member_count` int unsigned NOT NULL DEFAULT '0',
+ `tentative_member_count` int unsigned NOT NULL DEFAULT '0',
`last_updated` timestamp NULL DEFAULT NULL,
+ `flags` bigint unsigned NOT NULL DEFAULT '0',
+ `endpoints` json DEFAULT NULL,
+ `access_type` tinyint NOT NULL DEFAULT '0',
PRIMARY KEY (`id`),
UNIQUE KEY `username` (`username`,`domain`),
UNIQUE KEY `ap_id` (`ap_id`),
KEY `type` (`type`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
-
-
-# Dump of table likes
-# ------------------------------------------------------------
+--
+-- Table structure for table `likes`
+--
CREATE TABLE `likes` (
- `id` int(11) NOT NULL AUTO_INCREMENT,
- `user_id` int(11) unsigned NOT NULL,
- `object_id` int(11) unsigned NOT NULL,
- `object_type` int(11) unsigned NOT NULL,
- `ap_id` varchar(300) DEFAULT NULL,
+ `id` int NOT NULL AUTO_INCREMENT,
+ `user_id` int unsigned NOT NULL,
+ `object_id` int unsigned NOT NULL,
+ `object_type` int unsigned NOT NULL,
+ `ap_id` varchar(300) CHARACTER SET ascii COLLATE ascii_general_ci DEFAULT NULL,
UNIQUE KEY `user_id` (`user_id`,`object_id`,`object_type`),
UNIQUE KEY `id` (`id`),
KEY `object_type` (`object_type`,`object_id`),
CONSTRAINT `likes_ibfk_1` FOREIGN KEY (`user_id`) REFERENCES `users` (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
-
-
-# Dump of table media_cache
-# ------------------------------------------------------------
+--
+-- Table structure for table `media_cache`
+--
CREATE TABLE `media_cache` (
`url_hash` binary(16) NOT NULL,
- `size` int(11) unsigned NOT NULL,
+ `size` int unsigned NOT NULL,
`last_access` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
`info` blob,
- `type` tinyint(4) NOT NULL,
+ `type` tinyint NOT NULL,
PRIMARY KEY (`url_hash`),
KEY `last_access` (`last_access`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
-
-
-# Dump of table newsfeed
-# ------------------------------------------------------------
+--
+-- Table structure for table `newsfeed`
+--
CREATE TABLE `newsfeed` (
- `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
- `type` int(11) NOT NULL,
- `author_id` int(11) NOT NULL,
- `object_id` int(11) DEFAULT NULL,
+ `id` int unsigned NOT NULL AUTO_INCREMENT,
+ `type` int unsigned NOT NULL,
+ `author_id` int NOT NULL,
+ `object_id` int DEFAULT NULL,
`time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
PRIMARY KEY (`id`),
UNIQUE KEY `type` (`type`,`object_id`,`author_id`),
@@ -285,15 +283,14 @@ CREATE TABLE `newsfeed` (
KEY `author_id` (`author_id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
-
-
-# Dump of table newsfeed_comments
-# ------------------------------------------------------------
+--
+-- Table structure for table `newsfeed_comments`
+--
CREATE TABLE `newsfeed_comments` (
- `user_id` int(10) unsigned NOT NULL,
- `object_type` int(10) unsigned NOT NULL,
- `object_id` int(10) unsigned NOT NULL,
+ `user_id` int unsigned NOT NULL,
+ `object_type` int unsigned NOT NULL,
+ `object_id` int unsigned NOT NULL,
`last_comment_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
PRIMARY KEY (`object_type`,`object_id`,`user_id`),
KEY `user_id` (`user_id`),
@@ -301,54 +298,51 @@ CREATE TABLE `newsfeed_comments` (
CONSTRAINT `newsfeed_comments_ibfk_1` FOREIGN KEY (`user_id`) REFERENCES `users` (`id`) ON DELETE CASCADE
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
-
-
-# Dump of table notifications
-# ------------------------------------------------------------
+--
+-- Table structure for table `notifications`
+--
CREATE TABLE `notifications` (
- `id` int(11) unsigned NOT NULL AUTO_INCREMENT,
- `owner_id` int(11) unsigned NOT NULL,
- `type` smallint(5) unsigned NOT NULL,
- `object_id` int(11) unsigned DEFAULT NULL,
- `object_type` smallint(5) unsigned DEFAULT NULL,
- `related_object_id` int(11) unsigned DEFAULT NULL,
- `related_object_type` smallint(5) unsigned DEFAULT NULL,
- `actor_id` int(11) DEFAULT NULL,
+ `id` int unsigned NOT NULL AUTO_INCREMENT,
+ `owner_id` int unsigned NOT NULL,
+ `type` smallint unsigned NOT NULL,
+ `object_id` int unsigned DEFAULT NULL,
+ `object_type` smallint unsigned DEFAULT NULL,
+ `related_object_id` int unsigned DEFAULT NULL,
+ `related_object_type` smallint unsigned DEFAULT NULL,
+ `actor_id` int DEFAULT NULL,
`time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
PRIMARY KEY (`id`),
KEY `owner_id` (`owner_id`),
KEY `time` (`time`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
-
-
-# Dump of table poll_options
-# ------------------------------------------------------------
+--
+-- Table structure for table `poll_options`
+--
CREATE TABLE `poll_options` (
- `id` int(11) unsigned NOT NULL AUTO_INCREMENT,
- `poll_id` int(10) unsigned NOT NULL,
- `ap_id` varchar(300) CHARACTER SET ascii DEFAULT NULL,
+ `id` int unsigned NOT NULL AUTO_INCREMENT,
+ `poll_id` int unsigned NOT NULL,
+ `ap_id` varchar(300) CHARACTER SET ascii COLLATE ascii_general_ci DEFAULT NULL,
`text` text NOT NULL,
- `num_votes` int(10) unsigned NOT NULL DEFAULT '0',
+ `num_votes` int unsigned NOT NULL DEFAULT '0',
PRIMARY KEY (`id`),
UNIQUE KEY `ap_id` (`ap_id`),
KEY `poll_id` (`poll_id`),
CONSTRAINT `poll_options_ibfk_1` FOREIGN KEY (`poll_id`) REFERENCES `polls` (`id`) ON DELETE CASCADE
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
-
-
-# Dump of table poll_votes
-# ------------------------------------------------------------
+--
+-- Table structure for table `poll_votes`
+--
CREATE TABLE `poll_votes` (
- `id` int(11) unsigned NOT NULL AUTO_INCREMENT,
- `user_id` int(11) unsigned NOT NULL,
- `poll_id` int(10) unsigned NOT NULL,
- `option_id` int(10) unsigned NOT NULL,
- `ap_id` varchar(300) CHARACTER SET ascii DEFAULT NULL,
+ `id` int unsigned NOT NULL AUTO_INCREMENT,
+ `user_id` int unsigned NOT NULL,
+ `poll_id` int unsigned NOT NULL,
+ `option_id` int unsigned NOT NULL,
+ `ap_id` varchar(300) CHARACTER SET ascii COLLATE ascii_general_ci DEFAULT NULL,
PRIMARY KEY (`id`),
UNIQUE KEY `ap_id` (`ap_id`),
KEY `user_id` (`user_id`),
@@ -359,33 +353,32 @@ CREATE TABLE `poll_votes` (
CONSTRAINT `poll_votes_ibfk_3` FOREIGN KEY (`option_id`) REFERENCES `poll_options` (`id`) ON DELETE CASCADE
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
-
-
-# Dump of table polls
-# ------------------------------------------------------------
+--
+-- Table structure for table `polls`
+--
CREATE TABLE `polls` (
- `id` int(11) unsigned NOT NULL AUTO_INCREMENT,
- `owner_id` int(10) unsigned NOT NULL,
- `ap_id` varchar(300) CHARACTER SET ascii DEFAULT NULL,
+ `id` int unsigned NOT NULL AUTO_INCREMENT,
+ `owner_id` int NOT NULL,
+ `ap_id` varchar(300) CHARACTER SET ascii COLLATE ascii_general_ci DEFAULT NULL,
`question` text,
`is_anonymous` tinyint(1) NOT NULL DEFAULT '0',
`is_multi_choice` tinyint(1) NOT NULL DEFAULT '0',
`end_time` timestamp NULL DEFAULT NULL,
- `num_voted_users` int(10) unsigned NOT NULL DEFAULT '0',
+ `num_voted_users` int unsigned NOT NULL DEFAULT '0',
+ `last_vote_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
PRIMARY KEY (`id`),
UNIQUE KEY `ap_id` (`ap_id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
-
-
-# Dump of table qsearch_index
-# ------------------------------------------------------------
+--
+-- Table structure for table `qsearch_index`
+--
CREATE TABLE `qsearch_index` (
`string` text NOT NULL,
- `user_id` int(10) unsigned DEFAULT NULL,
- `group_id` int(10) unsigned DEFAULT NULL,
+ `user_id` int unsigned DEFAULT NULL,
+ `group_id` int unsigned DEFAULT NULL,
KEY `user_id` (`user_id`),
KEY `group_id` (`group_id`),
FULLTEXT KEY `string` (`string`),
@@ -393,28 +386,26 @@ CREATE TABLE `qsearch_index` (
CONSTRAINT `qsearch_index_ibfk_2` FOREIGN KEY (`group_id`) REFERENCES `groups` (`id`) ON DELETE CASCADE
) ENGINE=InnoDB DEFAULT CHARSET=ascii;
-
-
-# Dump of table servers
-# ------------------------------------------------------------
+--
+-- Table structure for table `servers`
+--
CREATE TABLE `servers` (
`host` varchar(100) NOT NULL DEFAULT '',
`software` varchar(100) DEFAULT NULL,
`version` varchar(30) DEFAULT NULL,
- `capabilities` bigint(20) unsigned NOT NULL DEFAULT '0',
+ `capabilities` bigint unsigned NOT NULL DEFAULT '0',
`last_updated` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
PRIMARY KEY (`host`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
-
-
-# Dump of table sessions
-# ------------------------------------------------------------
+--
+-- Table structure for table `sessions`
+--
CREATE TABLE `sessions` (
`id` binary(64) NOT NULL,
- `account_id` int(11) unsigned NOT NULL,
+ `account_id` int unsigned NOT NULL,
`last_active` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
`last_ip` varbinary(16) DEFAULT NULL,
PRIMARY KEY (`id`),
@@ -422,28 +413,26 @@ CREATE TABLE `sessions` (
CONSTRAINT `sessions_ibfk_1` FOREIGN KEY (`account_id`) REFERENCES `accounts` (`id`) ON DELETE CASCADE
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
-
-
-# Dump of table signup_invitations
-# ------------------------------------------------------------
+--
+-- Table structure for table `signup_invitations`
+--
CREATE TABLE `signup_invitations` (
`code` binary(16) NOT NULL DEFAULT '\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0',
- `owner_id` int(11) unsigned DEFAULT NULL,
+ `owner_id` int unsigned DEFAULT NULL,
`created` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
- `signups_remaining` int(11) unsigned NOT NULL,
+ `signups_remaining` int unsigned NOT NULL,
PRIMARY KEY (`code`),
KEY `owner_id` (`owner_id`),
CONSTRAINT `signup_invitations_ibfk_1` FOREIGN KEY (`owner_id`) REFERENCES `accounts` (`id`) ON DELETE CASCADE
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
-
-
-# Dump of table users
-# ------------------------------------------------------------
+--
+-- Table structure for table `users`
+--
CREATE TABLE `users` (
- `id` int(11) unsigned NOT NULL AUTO_INCREMENT,
+ `id` int unsigned NOT NULL AUTO_INCREMENT,
`fname` varchar(100) NOT NULL DEFAULT '',
`lname` varchar(100) DEFAULT NULL,
`middle_name` varchar(100) DEFAULT NULL,
@@ -455,52 +444,46 @@ CREATE TABLE `users` (
`private_key` blob,
`ap_url` varchar(300) DEFAULT NULL,
`ap_inbox` varchar(300) DEFAULT NULL,
- `ap_outbox` varchar(300) DEFAULT NULL,
`ap_shared_inbox` varchar(300) DEFAULT NULL,
`about` text,
- `gender` tinyint(4) unsigned NOT NULL DEFAULT '0',
- `profile_fields` text CHARACTER SET utf8mb4 COLLATE utf8mb4_bin,
- `avatar` text,
- `ap_id` varchar(300) CHARACTER SET ascii DEFAULT NULL,
- `ap_followers` varchar(300) DEFAULT NULL,
- `ap_following` varchar(300) DEFAULT NULL,
+ `about_source` text,
+ `gender` tinyint unsigned NOT NULL DEFAULT '0',
+ `profile_fields` json DEFAULT NULL,
+ `avatar` json DEFAULT NULL,
+ `ap_id` varchar(300) CHARACTER SET ascii COLLATE ascii_general_ci DEFAULT NULL,
`last_updated` timestamp NULL DEFAULT NULL,
- `flags` bigint(20) unsigned NOT NULL,
- `ap_wall` varchar(300) DEFAULT NULL,
- `ap_friends` varchar(300) DEFAULT NULL,
- `ap_groups` varchar(300) DEFAULT NULL,
+ `flags` bigint unsigned NOT NULL,
+ `endpoints` json DEFAULT NULL,
PRIMARY KEY (`id`),
UNIQUE KEY `username` (`username`,`domain`),
- UNIQUE KEY `ap_id` (`ap_id`),
- KEY `ap_outbox` (`ap_outbox`)
+ UNIQUE KEY `ap_id` (`ap_id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
-
-
-# Dump of table wall_posts
-# ------------------------------------------------------------
+--
+-- Table structure for table `wall_posts`
+--
CREATE TABLE `wall_posts` (
- `id` int(11) unsigned NOT NULL AUTO_INCREMENT,
- `author_id` int(11) unsigned DEFAULT NULL,
- `owner_user_id` int(11) unsigned DEFAULT NULL,
- `owner_group_id` int(11) unsigned DEFAULT NULL,
+ `id` int unsigned NOT NULL AUTO_INCREMENT,
+ `author_id` int unsigned DEFAULT NULL,
+ `owner_user_id` int unsigned DEFAULT NULL,
+ `owner_group_id` int unsigned DEFAULT NULL,
`text` text,
- `attachments` text CHARACTER SET utf8mb4 COLLATE utf8mb4_bin,
- `repost_of` int(11) unsigned DEFAULT NULL,
+ `attachments` text,
+ `repost_of` int unsigned DEFAULT NULL,
`ap_url` varchar(300) DEFAULT NULL,
- `ap_id` varchar(300) CHARACTER SET ascii DEFAULT NULL,
+ `ap_id` varchar(300) CHARACTER SET ascii COLLATE ascii_general_ci DEFAULT NULL,
`created_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
`content_warning` text,
`updated_at` timestamp NULL DEFAULT NULL,
`reply_key` varbinary(1024) DEFAULT NULL,
`mentions` varbinary(1024) DEFAULT NULL,
- `reply_count` int(10) unsigned NOT NULL DEFAULT '0',
+ `reply_count` int unsigned NOT NULL DEFAULT '0',
`ap_replies` varchar(300) DEFAULT NULL,
- `poll_id` int(10) unsigned DEFAULT NULL,
- `federation_state` tinyint(10) unsigned NOT NULL DEFAULT '0',
+ `poll_id` int unsigned DEFAULT NULL,
+ `federation_state` tinyint unsigned NOT NULL DEFAULT '0',
`source` text,
- `source_format` tinyint(3) unsigned DEFAULT NULL,
+ `source_format` tinyint unsigned DEFAULT NULL,
PRIMARY KEY (`id`),
UNIQUE KEY `ap_id` (`ap_id`),
KEY `owner_user_id` (`owner_user_id`),
@@ -508,25 +491,13 @@ CREATE TABLE `wall_posts` (
KEY `author_id` (`author_id`),
KEY `reply_key` (`reply_key`),
KEY `owner_group_id` (`owner_group_id`),
+ KEY `poll_id` (`poll_id`),
CONSTRAINT `wall_posts_ibfk_1` FOREIGN KEY (`owner_user_id`) REFERENCES `users` (`id`) ON DELETE CASCADE,
- CONSTRAINT `wall_posts_ibfk_2` FOREIGN KEY (`repost_of`) REFERENCES `wall_posts` (`id`) ON DELETE SET NULL ON UPDATE NO ACTION,
+ CONSTRAINT `wall_posts_ibfk_2` FOREIGN KEY (`repost_of`) REFERENCES `wall_posts` (`id`) ON DELETE SET NULL,
CONSTRAINT `wall_posts_ibfk_3` FOREIGN KEY (`author_id`) REFERENCES `users` (`id`) ON DELETE CASCADE,
CONSTRAINT `wall_posts_ibfk_4` FOREIGN KEY (`owner_group_id`) REFERENCES `groups` (`id`) ON DELETE CASCADE
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
-
-
-
---
--- Dumping routines (FUNCTION) for database 'smithereen'
---
-DELIMITER ;;
-
-DELIMITER ;
-
-/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
-/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
-/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
-/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
-/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
+
+-- Dump completed on 2022-05-22 11:21:31
diff --git a/src/main/java/smithereen/ApplicationContext.java b/src/main/java/smithereen/ApplicationContext.java
index c06be5ff..f979842e 100644
--- a/src/main/java/smithereen/ApplicationContext.java
+++ b/src/main/java/smithereen/ApplicationContext.java
@@ -1,15 +1,64 @@
package smithereen;
+import smithereen.activitypub.ActivityPubWorker;
+import smithereen.controllers.FriendsController;
+import smithereen.controllers.GroupsController;
+import smithereen.controllers.ObjectLinkResolver;
+import smithereen.controllers.PrivacyController;
+import smithereen.controllers.UserInteractionsController;
+import smithereen.controllers.UsersController;
import smithereen.controllers.WallController;
public class ApplicationContext{
private final WallController wallController;
+ private final GroupsController groupsController;
+ private final UsersController usersController;
+ private final UserInteractionsController userInteractionsController;
+ private final FriendsController friendsController;
+ private final ObjectLinkResolver objectLinkResolver;
+ private final ActivityPubWorker activityPubWorker;
+ private final PrivacyController privacyController;
public ApplicationContext(){
wallController=new WallController(this);
+ groupsController=new GroupsController(this);
+ usersController=new UsersController(this);
+ userInteractionsController=new UserInteractionsController(this);
+ friendsController=new FriendsController(this);
+ objectLinkResolver=new ObjectLinkResolver(this);
+ activityPubWorker=new ActivityPubWorker(this);
+ privacyController=new PrivacyController(this);
}
public WallController getWallController(){
return wallController;
}
+
+ public GroupsController getGroupsController(){
+ return groupsController;
+ }
+
+ public UsersController getUsersController(){
+ return usersController;
+ }
+
+ public UserInteractionsController getUserInteractionsController(){
+ return userInteractionsController;
+ }
+
+ public FriendsController getFriendsController(){
+ return friendsController;
+ }
+
+ public ObjectLinkResolver getObjectLinkResolver(){
+ return objectLinkResolver;
+ }
+
+ public ActivityPubWorker getActivityPubWorker(){
+ return activityPubWorker;
+ }
+
+ public PrivacyController getPrivacyController(){
+ return privacyController;
+ }
}
diff --git a/src/main/java/smithereen/CLI.java b/src/main/java/smithereen/CLI.java
index fe10502b..de2a473c 100644
--- a/src/main/java/smithereen/CLI.java
+++ b/src/main/java/smithereen/CLI.java
@@ -83,7 +83,7 @@ public static void initializeAdmin(){
SessionStorage.registerNewAccount(username, password, email, username, "", User.Gender.UNKNOWN);
Account acc=SessionStorage.getAccountForUsernameAndPassword(username, password);
UserStorage.setAccountAccessLevel(acc.id, Account.AccessLevel.ADMIN);
- System.out.println(E_BOLD+"You're all set! Now, make sure your web server is properly configured, then navigate to this server in your web browser an log into your account."+E_RESET);
+ System.out.println(E_BOLD+"You're all set! Now, make sure your web server is properly configured, then navigate to this server in your web browser and log into your account."+E_RESET);
}catch(SQLException|IOError x){
x.printStackTrace();
}
diff --git a/src/main/java/smithereen/Config.java b/src/main/java/smithereen/Config.java
index b9de2d35..6c609aa0 100644
--- a/src/main/java/smithereen/Config.java
+++ b/src/main/java/smithereen/Config.java
@@ -50,7 +50,7 @@ public class Config{
public static long mediaCacheFileSizeLimit;
public static boolean useHTTP;
public static String staticFilesPath;
- public static final boolean DEBUG=System.getProperty("smithereen.debug")!=null;
+ public static final boolean DEBUG=System.getProperty("smithereen.debug")!=null || System.getenv("SMITHEREEN_DEBUG")!=null;
public static String imgproxyLocalUploads;
public static String imgproxyLocalMediaCache;
@@ -120,10 +120,8 @@ public static void loadFromDatabase() throws SQLException{
Connection conn=DatabaseConnectionManager.getConnection();
try(ResultSet res=conn.createStatement().executeQuery("SELECT * FROM config")){
HashMap dbValues=new HashMap<>();
- if(res.first()){
- do{
- dbValues.put(res.getString(1), res.getString(2));
- }while(res.next());
+ while(res.next()){
+ dbValues.put(res.getString(1), res.getString(2));
}
dbSchemaVersion=Utils.parseIntOrDefault(dbValues.get("SchemaVersion"), 0);
diff --git a/src/main/java/smithereen/Mailer.java b/src/main/java/smithereen/Mailer.java
index f7a2b688..f01befbf 100644
--- a/src/main/java/smithereen/Mailer.java
+++ b/src/main/java/smithereen/Mailer.java
@@ -78,7 +78,7 @@ public void sendPasswordReset(Request req, Account account, String code){
Lang l=Utils.lang(req);
String link=UriBuilder.local().appendPath("account").appendPath("actuallyResetPassword").queryParam("code", code).build().toString();
String plaintext=l.get("email_password_reset_plain_before", Map.of("name", account.user.firstName, "serverName", Config.domain))+"\n\n"+link+"\n\n"+l.get("email_password_reset_after");
- send(account.email, l.get("email_password_reset_subject", Map.of("serverName", Config.domain)), plaintext, "reset_password", Map.of(
+ send(account.email, l.get("email_password_reset_subject", Map.of("domain", Config.domain)), plaintext, "reset_password", Map.of(
"domain", Config.domain,
"serverName", Config.serverDisplayName,
"name", account.user.firstName,
diff --git a/src/main/java/smithereen/ObjectLinkResolver.java b/src/main/java/smithereen/ObjectLinkResolver.java
deleted file mode 100644
index 1f01151f..00000000
--- a/src/main/java/smithereen/ObjectLinkResolver.java
+++ /dev/null
@@ -1,144 +0,0 @@
-package smithereen;
-
-import org.jetbrains.annotations.NotNull;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.IOException;
-import java.net.URI;
-import java.sql.SQLException;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import smithereen.activitypub.ActivityPub;
-import smithereen.activitypub.objects.ActivityPubObject;
-import smithereen.data.ForeignGroup;
-import smithereen.data.ForeignUser;
-import smithereen.data.Group;
-import smithereen.data.Post;
-import smithereen.data.UriBuilder;
-import smithereen.data.User;
-import smithereen.exceptions.ObjectNotFoundException;
-import smithereen.exceptions.UnsupportedRemoteObjectTypeException;
-import smithereen.storage.GroupStorage;
-import smithereen.storage.PostStorage;
-import smithereen.storage.UserStorage;
-
-import static smithereen.Utils.parseIntOrDefault;
-
-public class ObjectLinkResolver{
-
- private static final Pattern POSTS=Pattern.compile("^/posts/(\\d+)$");
- private static final Pattern USERS=Pattern.compile("^/users/(\\d+)$");
- private static final Pattern GROUPS=Pattern.compile("^/groups/(\\d+)$");
-
- private static final Logger LOG=LoggerFactory.getLogger(ObjectLinkResolver.class);
-
- private static Post getPost(String _id) throws SQLException{
- int id=parseIntOrDefault(_id, 0);
- if(id==0)
- throw new ObjectNotFoundException("Invalid local post ID");
- Post post=PostStorage.getPostByID(id, false);
- if(post==null)
- throw new ObjectNotFoundException("Post with ID "+id+" not found");
- return post;
- }
-
- private static User getUser(String _id) throws SQLException{
- int id=parseIntOrDefault(_id, 0);
- if(id==0)
- throw new ObjectNotFoundException();
- User user=UserStorage.getById(id);
- if(user==null || user instanceof ForeignUser)
- throw new ObjectNotFoundException();
- return user;
- }
-
- private static Group getGroup(String _id) throws SQLException{
- int id=parseIntOrDefault(_id, 0);
- if(id==0)
- throw new ObjectNotFoundException();
- Group group=GroupStorage.getById(id);
- if(group==null || group instanceof ForeignGroup)
- throw new ObjectNotFoundException();
- return group;
- }
-
- public static ActivityPubObject resolve(URI link) throws SQLException{
- return resolve(link, ActivityPubObject.class, false, true, false);
- }
-
- @NotNull
- public static T resolve(URI _link, Class expectedType, boolean allowFetching, boolean allowStorage, boolean forceRefetch) throws SQLException{
- LOG.debug("Resolving ActivityPub link: {}, expected type: {}", _link, expectedType.getName());
- URI link;
- if("bear".equals(_link.getScheme())){
- link=URI.create(UriBuilder.parseQueryString(_link.getRawQuery()).get("u"));
- }else{
- link=_link;
- }
- if(!Config.isLocal(link)){
- if(!forceRefetch){
- User user=UserStorage.getUserByActivityPubID(link);
- if(user!=null)
- return ensureTypeAndCast(user, expectedType);
- ForeignGroup group=GroupStorage.getForeignGroupByActivityPubID(link);
- if(group!=null)
- return ensureTypeAndCast(group, expectedType);
- Post post=PostStorage.getPostByID(link);
- if(post!=null)
- return ensureTypeAndCast(post, expectedType);
- }
- if(allowFetching){
- try{
- ActivityPubObject obj=ActivityPub.fetchRemoteObject(_link);
- if(obj!=null){
- T o=ensureTypeAndCast(obj, expectedType);
- o.resolveDependencies(allowFetching, allowStorage);
- if(allowStorage)
- storeOrUpdateRemoteObject(o);
- return o;
- }else{
- throw new UnsupportedRemoteObjectTypeException();
- }
- }catch(IOException x){
- throw new ObjectNotFoundException("Can't resolve remote object: "+link, x);
- }
- }
- throw new ObjectNotFoundException("Can't resolve remote object locally: "+link);
- }
-
- Matcher matcher=POSTS.matcher(link.getPath());
- if(matcher.find()){
- return ensureTypeAndCast(getPost(matcher.group(1)), expectedType);
- }
-
- matcher=USERS.matcher(link.getPath());
- if(matcher.find()){
- return ensureTypeAndCast(getUser(matcher.group(1)), expectedType);
- }
-
- matcher=GROUPS.matcher(link.getPath());
- if(matcher.find()){
- return ensureTypeAndCast(getGroup(matcher.group(1)), expectedType);
- }
-
- throw new ObjectNotFoundException("Invalid local URI");
- }
-
- public static void storeOrUpdateRemoteObject(ActivityPubObject o) throws SQLException{
- o.storeDependencies();
- if(o instanceof ForeignUser)
- UserStorage.putOrUpdateForeignUser((ForeignUser) o);
- else if(o instanceof ForeignGroup)
- GroupStorage.putOrUpdateForeignGroup((ForeignGroup) o);
- else if(o instanceof Post)
- PostStorage.putForeignWallPost((Post) o);
- }
-
- private static T ensureTypeAndCast(ActivityPubObject obj, Class type){
- if(type.isInstance(obj))
- return type.cast(obj);
- throw new IllegalStateException("Expected object of type "+type.getName()+", but got "+obj.getClass().getName()+" instead");
- }
-}
diff --git a/src/main/java/smithereen/SmithereenApplication.java b/src/main/java/smithereen/SmithereenApplication.java
index ce523595..b5a4eb55 100644
--- a/src/main/java/smithereen/SmithereenApplication.java
+++ b/src/main/java/smithereen/SmithereenApplication.java
@@ -9,9 +9,10 @@
import java.io.StringWriter;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
+import java.net.URLDecoder;
import java.nio.charset.StandardCharsets;
import java.sql.SQLException;
-import java.sql.Timestamp;
+import java.time.Instant;
import java.util.Arrays;
import java.util.Collections;
import java.util.Objects;
@@ -29,6 +30,7 @@
import smithereen.exceptions.FloodControlViolationException;
import smithereen.exceptions.ObjectNotFoundException;
import smithereen.exceptions.UserActionNotAllowedException;
+import smithereen.exceptions.UserErrorException;
import smithereen.routes.ActivityPubRoutes;
import smithereen.routes.ApiRoutes;
import smithereen.routes.GroupsRoutes;
@@ -74,6 +76,13 @@ public class SmithereenApplication{
System.setProperty("org.slf4j.simpleLogger.showShortLogName", "true");
if(Config.DEBUG)
System.setProperty("org.slf4j.simpleLogger.log.smithereen", "trace");
+ String addProperties=System.getenv("SMITHEREEN_SET_PROPS");
+ if(addProperties!=null){
+ Arrays.stream(addProperties.split("&")).forEach(s->{
+ String[] kv=s.split("=", 2);
+ System.setProperty(kv[0], URLDecoder.decode(kv[1], StandardCharsets.UTF_8));
+ });
+ }
LOG=LoggerFactory.getLogger(SmithereenApplication.class);
context=new ApplicationContext();
@@ -135,10 +144,9 @@ public static void main(String[] args){
info.account=UserStorage.getAccount(info.account.id);
info.permissions=SessionStorage.getUserPermissions(info.account);
- if(System.currentTimeMillis()-info.account.lastActive.getTime()>=10*60*1000){
- Timestamp now=new Timestamp(System.currentTimeMillis());
- info.account.lastActive=now;
- SessionStorage.setLastActive(info.account.id, request.cookie("psid"), now);
+ if(System.currentTimeMillis()-info.account.lastActive.toEpochMilli()>=10*60*1000){
+ info.account.lastActive=Instant.now();
+ SessionStorage.setLastActive(info.account.id, request.cookie("psid"), info.account.lastActive);
}
}
// String hs="";
@@ -271,6 +279,7 @@ public static void main(String[] args){
getActivityPubCollection("/wall", 100, ActivityPubRoutes::userWall);
getActivityPubCollection("/friends", 100, ActivityPubRoutes::userFriends);
getActivityPubCollection("/groups", 100, ActivityPubRoutes::userGroups);
+ post("/collectionQuery", ActivityPubRoutes::userCollectionQuery);
postWithCSRF("/createWallPost", PostRoutes::createUserWallPost);
getLoggedIn("/confirmBlock", ProfileRoutes::confirmBlockUser);
@@ -283,6 +292,19 @@ public static void main(String[] args){
get("", ProfileRoutes::friends);
getLoggedIn("/mutual", ProfileRoutes::mutualFriends);
});
+ path("/wall", ()->{
+ get("", PostRoutes::userWallAll);
+ get("/own", PostRoutes::userWallOwn);
+ get("/with/:otherUserID", PostRoutes::wallToWall);
+ });
+ get("/followers", ProfileRoutes::followers);
+ get("/following", ProfileRoutes::following);
+ postWithCSRF("/respondToFriendRequest", ProfileRoutes::respondToFriendRequest);
+ getWithCSRF("/respondToFriendRequest", ProfileRoutes::respondToFriendRequest);
+
+ getRequiringAccessLevelWithCSRF("/syncRelCollections", Account.AccessLevel.ADMIN, ProfileRoutes::syncRelationshipsCollections);
+ getRequiringAccessLevelWithCSRF("/syncContentCollections", Account.AccessLevel.ADMIN, ProfileRoutes::syncContentCollections);
+ getRequiringAccessLevelWithCSRF("/syncProfile", Account.AccessLevel.ADMIN, ProfileRoutes::syncProfile);
});
path("/groups/:id", ()->{
@@ -308,8 +330,11 @@ public static void main(String[] args){
get("/inbox", SmithereenApplication::methodNotAllowed);
getActivityPubCollection("/outbox", 50, ActivityPubRoutes::groupOutbox);
post("/outbox", SmithereenApplication::methodNotAllowed);
- getActivityPubCollection("/followers", 50, ActivityPubRoutes::groupFollowers);
+ getActivityPubCollection("/members", 50, ActivityPubRoutes::groupMembers);
+ getActivityPubCollection("/tentativeMembers", 50, ActivityPubRoutes::groupTentativeMembers);
getActivityPubCollection("/wall", 50, ActivityPubRoutes::groupWall);
+ get("/actorToken", ActivityPubRoutes::groupActorToken);
+ post("/collectionQuery", ActivityPubRoutes::groupCollectionQuery);
getLoggedIn("/edit", GroupsRoutes::editGeneral);
postWithCSRF("/saveGeneral", GroupsRoutes::saveGeneral);
@@ -330,9 +355,26 @@ public static void main(String[] args){
postWithCSRF("/unblockUser", GroupsRoutes::unblockUser);
postWithCSRF("/blockDomain", GroupsRoutes::blockDomain);
postWithCSRF("/unblockDomain", GroupsRoutes::unblockDomain);
+ getLoggedIn("/confirmRemoveUser", GroupsRoutes::confirmRemoveUser);
+ postWithCSRF("/removeUser", GroupsRoutes::removeUser);
+ getLoggedIn("/editJoinRequests", GroupsRoutes::editJoinRequests);
+ getWithCSRF("/acceptJoinRequest", GroupsRoutes::acceptJoinRequest);
+ getWithCSRF("/rejectJoinRequest", GroupsRoutes::rejectJoinRequest);
+ getLoggedIn("/editInvitations", GroupsRoutes::editInvitations);
+ getWithCSRF("/cancelInvite", GroupsRoutes::editCancelInvitation);
get("/members", GroupsRoutes::members);
+ get("/tentativeMembers", GroupsRoutes::tentativeMembers);
get("/admins", GroupsRoutes::admins);
+ path("/wall", ()->{
+ get("", PostRoutes::groupWall);
+ });
+ getWithCSRF("/invite", GroupsRoutes::inviteFriend);
+ postWithCSRF("/respondToInvite", GroupsRoutes::respondToInvite);
+
+ getRequiringAccessLevelWithCSRF("/syncRelCollections", Account.AccessLevel.ADMIN, GroupsRoutes::syncRelationshipsCollections);
+ getRequiringAccessLevelWithCSRF("/syncContentCollections", Account.AccessLevel.ADMIN, GroupsRoutes::syncContentCollections);
+ getRequiringAccessLevelWithCSRF("/syncProfile", Account.AccessLevel.ADMIN, GroupsRoutes::syncProfile);
});
path("/posts/:postID", ()->{
@@ -374,6 +416,15 @@ public static void main(String[] args){
getLoggedIn("/managed", GroupsRoutes::myManagedGroups);
getLoggedIn("/create", GroupsRoutes::createGroup);
postWithCSRF("/create", GroupsRoutes::doCreateGroup);
+ getLoggedIn("/invites", GroupsRoutes::groupInvitations);
+ });
+ path("/events", ()->{
+ getLoggedIn("", GroupsRoutes::myEvents);
+ getLoggedIn("/past", GroupsRoutes::myPastEvents);
+ getLoggedIn("/create", GroupsRoutes::createEvent);
+ getLoggedIn("/calendar", GroupsRoutes::eventCalendar);
+ getLoggedIn("/dayEventsPopup", GroupsRoutes::eventCalendarDayPopup);
+ getLoggedIn("/invites", GroupsRoutes::eventInvitations);
});
});
@@ -393,22 +444,12 @@ public static void main(String[] args){
getActivityPub("", ActivityPubRoutes::userActor);
get("", ProfileRoutes::profile);
-
postWithCSRF("/remoteFollow", ActivityPubRoutes::remoteFollow);
getLoggedIn("/confirmSendFriendRequest", ProfileRoutes::confirmSendFriendRequest);
postWithCSRF("/doSendFriendRequest", ProfileRoutes::doSendFriendRequest);
- postWithCSRF("/respondToFriendRequest", ProfileRoutes::respondToFriendRequest);
- getWithCSRF("/respondToFriendRequest", ProfileRoutes::respondToFriendRequest);
postWithCSRF("/doRemoveFriend", ProfileRoutes::doRemoveFriend);
getLoggedIn("/confirmRemoveFriend", ProfileRoutes::confirmRemoveFriend);
- get("/followers", ProfileRoutes::followers);
- get("/following", ProfileRoutes::following);
- path("/wall", ()->{
- get("", PostRoutes::wallAll);
- get("/own", PostRoutes::wallOwn);
- get("/with/:other_username", PostRoutes::wallToWall);
- });
});
@@ -417,10 +458,14 @@ public static void main(String[] args){
resp.body(Utils.wrapErrorString(req, resp, Objects.requireNonNullElse(x.getMessage(), "err_not_found")));
});
exception(UserActionNotAllowedException.class, (x, req, resp)->{
+ if(Config.DEBUG)
+ LOG.warn("403: {}", req.pathInfo(), x);
resp.status(403);
resp.body(Utils.wrapErrorString(req, resp, Objects.requireNonNullElse(x.getMessage(), "err_access")));
});
exception(BadRequestException.class, (x, req, resp)->{
+ if(Config.DEBUG)
+ LOG.warn("400: {}", req.pathInfo(), x);
resp.status(400);
String msg=x.getMessage();
if(StringUtils.isNotEmpty(msg))
@@ -432,6 +477,9 @@ public static void main(String[] args){
resp.status(429);
resp.body(Utils.wrapErrorString(req, resp, Objects.requireNonNullElse(x.getMessage(), "err_flood_control")));
});
+ exception(UserErrorException.class, (x, req, resp)->{
+ resp.body(Utils.wrapErrorString(req, resp, x.getMessage()));
+ });
exception(Exception.class, (exception, req, res) -> {
LOG.warn("Exception while processing {} {}", req.requestMethod(), req.raw().getPathInfo(), exception);
res.status(500);
@@ -506,7 +554,7 @@ public static void main(String[] args){
// These try-catch blocks are needed because these classes might not have been loaded by the time the process is shut down,
// and the JVM refuses to load any new classes from within a shutdown hook.
try{
- ActivityPubWorker.shutDown();
+ context.getActivityPubWorker().shutDown();
}catch(NoClassDefFoundError ignore){}
try{
MaintenanceScheduler.shutDown();
diff --git a/src/main/java/smithereen/Utils.java b/src/main/java/smithereen/Utils.java
index 2c0346f1..8797fd47 100644
--- a/src/main/java/smithereen/Utils.java
+++ b/src/main/java/smithereen/Utils.java
@@ -26,20 +26,22 @@
import java.net.URISyntaxException;
import java.net.URLEncoder;
import java.sql.SQLException;
-import java.text.SimpleDateFormat;
import java.time.Instant;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
import java.time.format.DateTimeFormatter;
import java.time.format.DateTimeParseException;
-import java.time.temporal.ChronoField;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
-import java.util.Date;
+import java.util.EnumSet;
import java.util.HashMap;
import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.Random;
+import java.util.Set;
import java.util.TimeZone;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.TimeUnit;
@@ -49,17 +51,13 @@
import java.util.zip.CRC32;
import cz.jirutka.unidecode.Unidecode;
-import smithereen.activitypub.ActivityPub;
-import smithereen.activitypub.objects.ActivityPubObject;
-import smithereen.activitypub.objects.Mention;
import smithereen.data.Account;
import smithereen.data.ForeignUser;
import smithereen.data.Group;
-import smithereen.data.Post;
import smithereen.data.SessionInfo;
import smithereen.data.User;
import smithereen.data.WebDeltaResponse;
-import smithereen.exceptions.ObjectNotFoundException;
+import smithereen.exceptions.BadRequestException;
import smithereen.exceptions.UserActionNotAllowedException;
import smithereen.lang.Lang;
import smithereen.storage.GroupStorage;
@@ -72,13 +70,15 @@
import spark.Request;
import spark.Response;
import spark.Session;
+import spark.utils.MimeParse;
import spark.utils.StringUtils;
+import static spark.Spark.get;
+
public class Utils{
private static final List RESERVED_USERNAMES=Arrays.asList("account", "settings", "feed", "activitypub", "api", "system", "users", "groups", "posts", "session", "robots.txt", "my", "activitypub_service_actor", "healthz");
private static final Whitelist HTML_SANITIZER=new MicroFormatAwareHTMLWhitelist();
- private static final ThreadLocal ISO_DATE_FORMAT=new ThreadLocal<>();
public static final String staticFileHash;
private static Unidecode unidecode=Unidecode.toAscii();
private static Random rand=new Random();
@@ -90,7 +90,7 @@ public class Utils{
public static final Pattern URL_PATTERN=Pattern.compile("\\b(https?:\\/\\/)?("+IDN_DOMAIN_REGEX+")(?:\\:\\d+)?((?:\\/(?:[\\w\\.@%:!+-]|\\([^\\s]+?\\))+)*)(\\?(?:\\w+(?:=(?:[\\w\\.@%:!+-]|\\([^\\s]+?\\))+&?)?)+)?(#(?:[\\w\\.@%:!+-]|\\([^\\s]+?\\))+)?", Pattern.CASE_INSENSITIVE);
public static final Pattern MENTION_PATTERN=Pattern.compile("@([a-zA-Z0-9._-]+)(?:@("+IDN_DOMAIN_REGEX+"))?");
public static final Pattern USERNAME_DOMAIN_PATTERN=Pattern.compile("@?([a-zA-Z0-9._-]+)@("+IDN_DOMAIN_REGEX+")");
- private static final Pattern SIGNATURE_HEADER_PATTERN=Pattern.compile("([a-zA-Z0-9]+)=\\\"((?:[^\\\"\\\\]|\\\\.)*)\\\"\\s*([,;])?\\s*");
+ private static final Pattern SIGNATURE_HEADER_PATTERN=Pattern.compile("([!#$%^'*+\\-.^_`|~0-9A-Za-z]+)=(?:(?:\\\"((?:[^\\\"\\\\]|\\\\.)*)\\\")|([!#$%^'*+\\-.^_`|~0-9A-Za-z]+))\\s*([,;])?\\s*");
private static final Pattern NON_ASCII_PATTERN=Pattern.compile("\\P{ASCII}");
public static final Gson gson=new GsonBuilder()
@@ -162,18 +162,26 @@ public static int parseIntOrDefault(String s, int d){
}
}
+ /**
+ * Parse a decimal integer from string without throwing any exceptions.
+ * @param s The string to parse.
+ * @return The parsed integer if successful, 0 on failure or if s was null.
+ */
+ public static int safeParseInt(String s){
+ return parseIntOrDefault(s, 0);
+ }
+
public static Object wrapError(Request req, Response resp, String errorKey){
return wrapError(req, resp, errorKey, null);
}
public static Object wrapError(Request req, Response resp, String errorKey, Map formatArgs){
- SessionInfo info=req.session().attribute("info");
Lang l=lang(req);
String msg=formatArgs!=null ? l.get(errorKey, formatArgs) : l.get(errorKey);
if(isAjax(req)){
return new WebDeltaResponse(resp).messageBox(l.get("error"), msg, l.get("ok"));
}
- return new RenderedTemplateResponse("generic_error", req).with("error", msg).with("back", info!=null && info.history!=null ? info.history.last() : "/").with("title", l.get("error"));
+ return new RenderedTemplateResponse("generic_error", req).with("error", msg).with("back", back(req)).with("title", l.get("error"));
}
public static String wrapErrorString(Request req, Response resp, String errorKey){
@@ -181,13 +189,14 @@ public static String wrapErrorString(Request req, Response resp, String errorKey
}
public static String wrapErrorString(Request req, Response resp, String errorKey, Map formatArgs){
- SessionInfo info=req.session().attribute("info");
Lang l=lang(req);
String msg=formatArgs!=null ? l.get(errorKey, formatArgs) : l.get(errorKey);
if(isAjax(req)){
return new WebDeltaResponse(resp).messageBox(l.get("error"), msg, l.get("ok")).json();
+ }else if(isActivityPub(req)){
+ return msg;
}
- return new RenderedTemplateResponse("generic_error", req).with("error", msg).with("back", info!=null && info.history!=null ? info.history.last() : "/").with("title", l.get("error")).renderToString();
+ return new RenderedTemplateResponse("generic_error", req).with("error", msg).with("back", back(req)).with("title", l.get("error")).renderToString();
}
public static Object wrapForm(Request req, Response resp, String templateName, String formAction, String title, String buttonKey, RenderedTemplateResponse templateModel){
@@ -234,7 +243,7 @@ public static boolean isValidUsername(String username){
}
public static boolean isReservedUsername(String username){
- return RESERVED_USERNAMES.contains(username.toLowerCase());
+ return RESERVED_USERNAMES.contains(username.toLowerCase()) || username.toLowerCase().matches("^(id|club|event)\\d+$");
}
public static boolean isValidEmail(String email){
@@ -269,23 +278,13 @@ public static String sanitizeHTML(String src, URI documentLocation){
return Jsoup.clean(src, documentLocation.toString(), HTML_SANITIZER);
}
- private static SimpleDateFormat isoDateFormat(){
- SimpleDateFormat format=ISO_DATE_FORMAT.get();
- if(format!=null)
- return format;
- format=new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'", Locale.US);
- format.setTimeZone(TimeZone.getTimeZone("GMT"));
- ISO_DATE_FORMAT.set(format);
- return format;
+ public static String formatDateAsISO(Instant date){
+ return DateTimeFormatter.ISO_INSTANT.format(date);
}
- public static String formatDateAsISO(Date date){
- return isoDateFormat().format(date);
- }
-
- public static Date parseISODate(String date){
+ public static Instant parseISODate(String date){
try{
- return new Date(DateTimeFormatter.ISO_INSTANT.parse(date).getLong(ChronoField.INSTANT_SECONDS)*1000L);
+ return DateTimeFormatter.ISO_INSTANT.parse(date, Instant::from);
}catch(DateTimeParseException x){
return null;
}
@@ -378,7 +377,8 @@ public static String back(Request req){
String ref=req.headers("referer");
if(ref!=null)
return ref;
- return sessionInfo(req).history.last();
+ SessionInfo sessionInfo=sessionInfo(req);
+ return sessionInfo!=null ? sessionInfo.history.last() : "/";
}
public static String truncateOnWordBoundary(String s, int maxLen){
@@ -393,6 +393,18 @@ public static boolean isAjax(Request req){
return req.queryParams("_ajax")!=null;
}
+ public static boolean isMobile(Request req){
+ return req.attribute("mobile")!=null;
+ }
+
+ public static boolean isActivityPub(Request req){
+ String accept=req.headers("accept");
+ if(StringUtils.isEmpty(accept))
+ return false;
+ String matched=MimeParse.bestMatch(Set.of("application/activity+json", "application/ld+json", ""), accept);
+ return StringUtils.isNotEmpty(matched);
+ }
+
public static String escapeHTML(String s){
return HtmlEscape.escapeHtml4Xml(s);
}
@@ -564,6 +576,8 @@ public static String preprocessPostHTML(String text, MentionCallback mentionCall
}
public static String postprocessPostHTMLForDisplay(String text){
+ if(text==null)
+ return "";
Document doc=Jsoup.parseBodyFragment(text);
for(Element el:doc.getElementsByTag("a")){
@@ -607,7 +621,7 @@ public static String postprocessPostHTMLForActivityPub(String text){
return doc.body().html();
}
- public static String preprocessRemotePostMentions(String text, List users){
+ public static String preprocessRemotePostMentions(String text, Set users){
Document doc=Jsoup.parseBodyFragment(text);
for(Element link:doc.select("a.mention")){
@@ -631,36 +645,6 @@ public static String preprocessRemotePostMentions(String text, List users)
return doc.body().html();
}
- public static void loadAndPreprocessRemotePostMentions(Post post) throws SQLException{
- if(post.tag!=null){
- for(ActivityPubObject tag:post.tag){
- if(tag instanceof Mention){
- URI uri=((Mention) tag).href;
- User mentionedUser=UserStorage.getUserByActivityPubID(uri);
- if(mentionedUser==null){
- try{
- ActivityPubObject _user=ActivityPub.fetchRemoteObject(uri);
- if(_user instanceof ForeignUser){
- ForeignUser u=(ForeignUser) _user;
- UserStorage.putOrUpdateForeignUser(u);
- mentionedUser=u;
- }
- }catch(IOException|ObjectNotFoundException ignore){}
- }
- if(mentionedUser!=null){
- if(post.mentionedUsers.isEmpty())
- post.mentionedUsers=new ArrayList<>();
- if(!post.mentionedUsers.contains(mentionedUser))
- post.mentionedUsers.add(mentionedUser);
- }
- }
- }
- if(!post.mentionedUsers.isEmpty() && StringUtils.isNotEmpty(post.content)){
- post.content=Utils.preprocessRemotePostMentions(post.content, post.mentionedUsers);
- }
- }
- }
-
public static void ensureUserNotBlocked(User self, User target) throws SQLException{
if(self instanceof ForeignUser && UserStorage.isDomainBlocked(target.id, self.domain))
throw new UserActionNotAllowedException();
@@ -681,8 +665,14 @@ public static List> parseSignatureHeader(String header){
HashMap curMap=new HashMap<>();
while(matcher.find()){
String key=matcher.group(1);
- String value=matcher.group(2).replace("\\\"", "\"").replace("\\\\", "\\");
- String separator=matcher.group(3);
+
+ String value=matcher.group(2);
+ if(value == null) {
+ value = matcher.group(3);
+ }
+ value = value.replace("\\\"", "\"").replace("\\\\", "\\");
+
+ String separator=matcher.group(4);
curMap.put(key, value);
if(separator==null || ";".equals(separator)){
res.add(curMap);
@@ -702,7 +692,7 @@ public static String serializeSignatureHeader(List> sig){
public static String transliterate(String in){
if(in==null)
return null;
- return unidecode.decode(in.trim());
+ return unidecode.decode(in.trim()).replaceAll(Pattern.quote("[?]"), "");
}
public static boolean isURL(String in){
@@ -757,6 +747,13 @@ public static String convertIdnToAsciiIfNeeded(String domain) throws IllegalArgu
return domain;
}
+ public static int offset(Request req){
+ String offset=req.queryParams("offset");
+ if(StringUtils.isEmpty(offset))
+ return 0;
+ return parseIntOrDefault(offset, 0);
+ }
+
@NotNull
public static ApplicationContext context(Request req){
ApplicationContext context=req.attribute("context");
@@ -765,6 +762,65 @@ public static ApplicationContext context(Request req){
return context;
}
+ @NotNull
+ public static Instant instantFromDateAndTime(Request req, String dateStr, String timeStr){
+ LocalDate date=DateTimeFormatter.ISO_LOCAL_DATE.parse(dateStr, LocalDate::from);
+ LocalTime time=DateTimeFormatter.ISO_LOCAL_TIME.parse(timeStr, LocalTime::from);
+ return LocalDateTime.of(date, time).atZone(timeZoneForRequest(req).toZoneId()).toInstant();
+ }
+
+ public static > long serializeEnumSet(EnumSet set, Class cls){
+ if(cls.getEnumConstants().length>64)
+ throw new IllegalArgumentException("this enum has more than 64 constants");
+ long result=0;
+ for(E value:set){
+ result|=1L << value.ordinal();
+ }
+ return result;
+ }
+
+ public static > void deserializeEnumSet(EnumSet set, Class cls, long l){
+ set.clear();
+ E[] consts=cls.getEnumConstants();
+ if(consts.length>64)
+ throw new IllegalArgumentException("this enum has more than 64 constants");
+ for(E e:consts){
+ if((l&1)==1)
+ set.add(e);
+ l >>= 1;
+ }
+ }
+
+ /**
+ * Convert a string to an enum value
+ * @param val
+ * @param cls
+ * @param
+ * @return
+ */
+ public static > E enumValue(String val, Class cls){
+ if(val==null)
+ throw new BadRequestException("null value");
+ try{
+ return Enum.valueOf(cls, val);
+ }catch(IllegalArgumentException x){
+ throw new BadRequestException("'"+val+"' is not a valid value for "+cls.getSimpleName());
+ }
+ }
+
+ /**
+ * Ensure that the request has required query parameters to avoid any surprise NPEs.
+ * @param req The request
+ * @param params The parameter names
+ * @throws BadRequestException if any of the parameters doesn't present
+ */
+ public static void requireQueryParams(Request req, String... params){
+ for(String param:params){
+ if(StringUtils.isEmpty(req.queryParams(param)))
+ throw new BadRequestException("Required parameter '"+param+"' not present");
+ }
+ }
+
public interface MentionCallback{
User resolveMention(String username, String domain);
User resolveMention(String uri);
diff --git a/src/main/java/smithereen/activitypub/ActivityHandlerContext.java b/src/main/java/smithereen/activitypub/ActivityHandlerContext.java
index a79d2ebc..7857d4e4 100644
--- a/src/main/java/smithereen/activitypub/ActivityHandlerContext.java
+++ b/src/main/java/smithereen/activitypub/ActivityHandlerContext.java
@@ -3,16 +3,18 @@
import java.net.URI;
import java.util.List;
+import smithereen.ApplicationContext;
import smithereen.activitypub.objects.Actor;
-import smithereen.data.ForeignUser;
import smithereen.data.User;
public class ActivityHandlerContext{
private String origRequestBody;
public final Actor ldSignatureOwner;
public final Actor httpSignatureOwner;
+ public final ApplicationContext appContext;
- public ActivityHandlerContext(String origRequestBody, Actor ldSignatureOwner, Actor httpSignatureOwner){
+ public ActivityHandlerContext(ApplicationContext appContext, String origRequestBody, Actor ldSignatureOwner, Actor httpSignatureOwner){
+ this.appContext=appContext;
this.origRequestBody=origRequestBody;
this.ldSignatureOwner=ldSignatureOwner;
this.httpSignatureOwner=httpSignatureOwner;
@@ -21,6 +23,6 @@ public ActivityHandlerContext(String origRequestBody, Actor ldSignatureOwner, Ac
public void forwardActivity(List inboxes, User signer){
if(ldSignatureOwner==null)
throw new IllegalStateException("Can't forward an activity without LD-signature");
- ActivityPubWorker.getInstance().forwardActivity(origRequestBody, signer, inboxes, ldSignatureOwner.activityPubID.getHost());
+ appContext.getActivityPubWorker().forwardActivity(origRequestBody, signer, inboxes, ldSignatureOwner.activityPubID.getHost());
}
}
diff --git a/src/main/java/smithereen/activitypub/ActivityPub.java b/src/main/java/smithereen/activitypub/ActivityPub.java
index 1c466284..988aa1ef 100644
--- a/src/main/java/smithereen/activitypub/ActivityPub.java
+++ b/src/main/java/smithereen/activitypub/ActivityPub.java
@@ -1,10 +1,12 @@
package smithereen.activitypub;
+import com.google.gson.JsonArray;
import com.google.gson.JsonElement;
import com.google.gson.JsonObject;
import com.google.gson.JsonParseException;
import com.google.gson.JsonParser;
+import org.jetbrains.annotations.NotNull;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.w3c.dom.Document;
@@ -16,29 +18,54 @@
import java.io.IOException;
import java.net.URI;
import java.nio.charset.StandardCharsets;
+import java.security.InvalidKeyException;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
import java.security.Signature;
+import java.security.SignatureException;
+import java.sql.SQLException;
+import java.text.ParseException;
import java.text.SimpleDateFormat;
+import java.time.Instant;
+import java.time.format.DateTimeFormatter;
+import java.time.temporal.ChronoUnit;
+import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Base64;
+import java.util.Collection;
import java.util.Date;
import java.util.List;
import java.util.Locale;
import java.util.Map;
+import java.util.Objects;
import java.util.TimeZone;
+import java.util.stream.Collectors;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.ParserConfigurationException;
import okhttp3.Call;
+import okhttp3.FormBody;
+import okhttp3.HttpUrl;
import okhttp3.MediaType;
import okhttp3.OkHttpClient;
import okhttp3.Request;
import okhttp3.RequestBody;
import okhttp3.Response;
import okhttp3.ResponseBody;
+import smithereen.ApplicationContext;
import smithereen.Config;
+import smithereen.activitypub.objects.CollectionQueryResult;
+import smithereen.controllers.ObjectLinkResolver;
+import smithereen.data.ForeignGroup;
+import smithereen.data.ForeignUser;
+import smithereen.data.Group;
+import smithereen.data.User;
+import smithereen.exceptions.FederationException;
+import smithereen.exceptions.InternalServerErrorException;
+import smithereen.exceptions.UserActionNotAllowedException;
+import smithereen.storage.GroupStorage;
import smithereen.util.DisallowLocalhostInterceptor;
import smithereen.LruCache;
import smithereen.Utils;
@@ -55,9 +82,17 @@
import smithereen.jsonld.JLDException;
import smithereen.jsonld.JLDProcessor;
import smithereen.jsonld.LinkedDataSignatures;
+import smithereen.util.JsonArrayBuilder;
+import smithereen.util.JsonObjectBuilder;
import smithereen.util.UserAgentInterceptor;
import spark.utils.StringUtils;
+import static smithereen.Utils.context;
+import static smithereen.Utils.escapeHTML;
+import static smithereen.Utils.formatDateAsISO;
+import static smithereen.Utils.isActivityPub;
+import static smithereen.Utils.parseSignatureHeader;
+
public class ActivityPub{
public static final URI AS_PUBLIC=URI.create(JLD.ACTIVITY_STREAMS+"#Public");
@@ -75,7 +110,7 @@ public class ActivityPub{
.build();
}
- public static ActivityPubObject fetchRemoteObject(URI _uri) throws IOException{
+ public static ActivityPubObject fetchRemoteObject(URI _uri, Actor signer, JsonObject actorToken) throws IOException{
URI uri;
String token;
if("bear".equals(_uri.getScheme())){
@@ -97,7 +132,9 @@ public static ActivityPubObject fetchRemoteObject(URI _uri) throws IOException{
.header("Accept", CONTENT_TYPE);
if(token!=null)
builder.header("Authorization", "Bearer "+token);
- signRequest(builder, uri, ServiceActor.getInstance(), null, "get");
+ else if(actorToken!=null)
+ builder.header("Authorization", "ActivityPubActorToken "+actorToken);
+ signRequest(builder, uri, signer==null ? ServiceActor.getInstance() : signer, null, "get");
Request req=builder.build();
Call call=httpClient.newCall(req);
Response resp=call.execute();
@@ -144,10 +181,9 @@ private static Request.Builder signRequest(Request.Builder builder, URI url, Act
if(digestHeader!=null)
strToSign+="\ndigest: "+digestHeader;
- Signature sig;
byte[] signature;
try{
- sig=Signature.getInstance("SHA256withRSA");
+ Signature sig=Signature.getInstance("SHA256withRSA");
sig.initSign(actor.privateKey);
sig.update(strToSign.getBytes(StandardCharsets.UTF_8));
signature=sig.sign();
@@ -205,7 +241,7 @@ private static URI doWebfingerRequest(String username, String domain, String uri
String resource="acct:"+username+"@"+domain;
String url;
if(StringUtils.isEmpty(uriTemplate)){
- url="https://"+domain+"/.well-known/webfinger?resource="+resource;
+ url=(Config.useHTTP ? "http" : "https")+"://"+domain+"/.well-known/webfinger?resource="+resource;
}else{
url=uriTemplate.replace("{uri}", resource);
}
@@ -260,7 +296,7 @@ public static URI resolveUsername(String username, String domain) throws IOExcep
}catch(ObjectNotFoundException x){
if(redirect==null){
Request req=new Request.Builder()
- .url("https://"+domain+"/.well-known/host-meta")
+ .url((Config.useHTTP ? "http" : "https")+"://"+domain+"/.well-known/host-meta")
.header("Accept", "application/xrd+xml")
.build();
Response resp=httpClient.newCall(req).execute();
@@ -284,7 +320,7 @@ public static URI resolveUsername(String username, String domain) throws IOExcep
if("lrdd".equals(rel) && "application/xrd+xml".equals(type)){
if((template.startsWith("https://") || (Config.useHTTP && template.startsWith("http://"))) && template.contains("{uri}")){
synchronized(ActivityPub.class){
- if(("https://"+domain+"/.well-known/webfinger?resource={uri}").equals(template)){
+ if(template.endsWith("://"+domain+"/.well-known/webfinger?resource={uri}")){
// this isn't a real redirect
domainRedirects.put(domain, "");
// don't repeat the request, we already know that username doesn't exist (but the webfinger endpoint does)
@@ -310,4 +346,274 @@ public static URI resolveUsername(String username, String domain) throws IOExcep
throw new ObjectNotFoundException(x);
}
}
+
+ public static Actor verifyHttpSignature(spark.Request req, Actor userHint) throws ParseException, NoSuchAlgorithmException, InvalidKeyException, SignatureException, SQLException{
+ String sigHeader=req.headers("Signature");
+ if(sigHeader==null)
+ throw new BadRequestException("Request is missing Signature header");
+ List> values=parseSignatureHeader(sigHeader);
+ if(values.isEmpty())
+ throw new BadRequestException("Signature header has invalid format");
+ Map supportedSig=null;
+ for(Map sig:values){
+ if("rsa-sha256".equalsIgnoreCase(sig.get("algorithm")) || "hs2019".equalsIgnoreCase(sig.get("algorithm"))){
+ supportedSig=sig;
+ break;
+ }
+ }
+ if(supportedSig==null)
+ throw new BadRequestException("Unsupported signature algorithm \""+values.get(0).get("algorithm")+"\", expected \"rsa-sha256\" or \"hs2019\"");
+
+ if(!supportedSig.containsKey("keyId"))
+ throw new BadRequestException("Signature header is missing keyId field");
+ if(!supportedSig.containsKey("signature"))
+ throw new BadRequestException("Signature header is missing signature field");
+ if(!supportedSig.containsKey("headers"))
+ throw new BadRequestException("Signature header is missing headers field");
+
+ String keyId=supportedSig.get("keyId");
+ byte[] signature=Base64.getDecoder().decode(supportedSig.get("signature"));
+ List headers=Arrays.asList(supportedSig.get("headers").split(" "));
+
+ if(!headers.contains("(request-target)"))
+ throw new BadRequestException("(request-target) is not in signed headers");
+ if(!headers.contains("date"))
+ throw new BadRequestException("date is not in signed headers");
+ if(!headers.contains("host"))
+ throw new BadRequestException("host is not in signed headers");
+
+ SimpleDateFormat dateFormat=new SimpleDateFormat("EEE, dd MMM yyyy HH:mm:ss z", Locale.US);
+ dateFormat.setTimeZone(TimeZone.getTimeZone("GMT"));
+ long unixtime=dateFormat.parse(req.headers("date")).getTime();
+ long now=System.currentTimeMillis();
+ long diff=now-unixtime;
+ if(diff>30000L)
+ throw new BadRequestException("Date is too far in the future (difference: "+diff+"ms)");
+ if(diff<-30000L)
+ throw new BadRequestException("Date is too far in the past (difference: "+diff+"ms)");
+
+ URI userID=Utils.userIdFromKeyId(URI.create(keyId));
+ Actor user;
+ if(userHint!=null && userHint.activityPubID.equals(userID))
+ user=userHint;
+ else
+ user=context(req).getObjectLinkResolver().resolve(userID, Actor.class, true, false, false);
+
+ ArrayList sigParts=new ArrayList<>();
+ for(String header:headers){
+ String value;
+ if(header.equals("(request-target)")){
+ value=req.requestMethod().toLowerCase()+" "+req.pathInfo();
+ }else{
+ value=req.headers(header);
+ }
+ sigParts.add(header+": "+value);
+ }
+ String sigStr=String.join("\n", sigParts);
+ Signature sig=Signature.getInstance("SHA256withRSA");
+ sig.initVerify(user.publicKey);
+ sig.update(sigStr.getBytes(StandardCharsets.UTF_8));
+ if(!sig.verify(signature)){
+ LOG.info("Failed signature header: {}", sigHeader);
+ LOG.info("Failed signature string: '{}'", sigStr);
+ throw new BadRequestException("Signature failed to verify");
+ }
+ return user;
+ }
+
+ public static void enforceGroupContentAccess(@NotNull spark.Request req, @NotNull Group group){
+ if(group.accessType==Group.AccessType.OPEN)
+ return;
+ Actor signer;
+ try{
+ signer=verifyHttpSignature(req, null);
+ }catch(Exception x){
+ throw new UserActionNotAllowedException("This object is in a "+group.accessType.toString().toLowerCase()+" group. Valid member HTTP signature is required.", x);
+ }
+ if(!(signer instanceof ForeignUser user))
+ throw new UserActionNotAllowedException("HTTP signature is valid but actor has wrong type: "+signer.getType());
+ if(group instanceof ForeignGroup foreignGroup){
+ String authHeader=req.headers("Authorization");
+ if(StringUtils.isEmpty(authHeader))
+ throw new UserActionNotAllowedException("Authorization header with ActivityPubActorToken is required");
+ String[] parts=authHeader.split(" ", 2);
+ if(parts.length!=2)
+ throw new BadRequestException();
+ if(!"ActivityPubActorToken".equals(parts[0]))
+ throw new BadRequestException("Unsupported auth scheme '"+parts[0]+"'");
+ JsonObject token;
+ try{
+ token=JsonParser.parseString(parts[1]).getAsJsonObject();
+ }catch(JsonParseException x){
+ throw new BadRequestException("Can't parse actor token: "+x.getMessage(), x);
+ }
+ verifyActorToken(token, user, foreignGroup);
+ }else{
+ try{
+ if(!GroupStorage.areThereGroupMembersWithDomain(group.id, user.domain))
+ throw new UserActionNotAllowedException("HTTP signature is valid, but this object is in a "+group.accessType.toString().toLowerCase()+" group and "+escapeHTML(user.activityPubID.toString())+" is not its member");
+ }catch(SQLException x){
+ throw new InternalServerErrorException(x);
+ }
+ }
+ LOG.trace("Actor {} was allowed to access object {} in a {} group {}", signer.activityPubID, req.pathInfo(), group.accessType, group.activityPubID);
+ }
+
+ private static String generateActorTokenStringToBeSigned(JsonObject obj){
+ return obj.keySet()
+ .stream()
+ .filter(key->!key.equals("signature"))
+ .map(key->key+": "+obj.getAsJsonPrimitive(key).toString())
+ .sorted()
+ .collect(Collectors.joining("\n"));
+ }
+
+ public static JsonObject generateActorToken(@NotNull ApplicationContext context, @NotNull Actor actor, @NotNull Group group){
+ group.ensureLocal();
+ try{
+ if(!GroupStorage.areThereGroupMembersWithDomain(group.id, actor.domain))
+ throw new UserActionNotAllowedException("There are no "+actor.domain+" members in this group");
+ }catch(SQLException x){
+ throw new InternalServerErrorException(x);
+ }
+ Instant now=Instant.now();
+ JsonObject token=new JsonObjectBuilder()
+ .add("issuer", group.activityPubID.toString())
+ .add("actor", actor.activityPubID.toString())
+ .add("issuedAt", formatDateAsISO(now))
+ .add("validUntil", formatDateAsISO(now.plus(30, ChronoUnit.MINUTES)))
+ .build();
+ String strToSign=generateActorTokenStringToBeSigned(token);
+ byte[] signature;
+ try{
+ Signature sig=Signature.getInstance("SHA256withRSA");
+ sig.initSign(group.privateKey);
+ sig.update(strToSign.getBytes(StandardCharsets.UTF_8));
+ signature=sig.sign();
+ }catch(Exception x){
+ LOG.error("Exception while signing request", x);
+ throw new RuntimeException(x);
+ }
+
+ String keyID=group.activityPubID+"#main-key";
+ token.add("signatures", new JsonArrayBuilder().add(
+ new JsonObjectBuilder()
+ .add("algorithm", "rsa-sha256")
+ .add("keyId", keyID)
+ .add("signature", Base64.getEncoder().encodeToString(signature))
+ .build()
+ ).build());
+
+ return token;
+ }
+
+ /**
+ * Verify an actor token for user membership in a closed or private group.
+ * @param token The actor token as received from the group
+ * @param user The user for which the token was issued
+ * @param group The group that issued the token
+ * @throws UserActionNotAllowedException if the token is not valid
+ */
+ public static void verifyActorToken(@NotNull JsonObject token, @NotNull Actor user, @NotNull ForeignGroup group){
+ try{
+ URI issuerID=new URI(token.getAsJsonPrimitive("issuer").getAsString());
+ if(!issuerID.equals(group.activityPubID))
+ throw new IllegalArgumentException("Issuer ID '"+issuerID+"' doesn't match the expected '"+group.activityPubID+"'");
+ URI actorID=new URI(token.getAsJsonPrimitive("actor").getAsString());
+ if(!actorID.equals(user.activityPubID))
+ throw new IllegalArgumentException("Actor ID '"+actorID+"' doesn't match the expected '"+user.activityPubID+"'");
+ Instant now=Instant.now();
+ Instant issuedAt=DateTimeFormatter.ISO_INSTANT.parse(token.getAsJsonPrimitive("issuedAt").getAsString(), Instant::from);
+ if(issuedAt.isAfter(now.plus(5, ChronoUnit.MINUTES)))
+ throw new IllegalArgumentException("issuedAt is in the future");
+ Instant validUntil=DateTimeFormatter.ISO_INSTANT.parse(token.getAsJsonPrimitive("validUntil").getAsString(), Instant::from);
+ if(validUntil.isBefore(now.minus(5, ChronoUnit.MINUTES)))
+ throw new IllegalArgumentException("This token has expired");
+ if(issuedAt.isAfter(validUntil))
+ throw new IllegalArgumentException("issuedAt is after validUntil");
+ if(ChronoUnit.MINUTES.between(issuedAt, validUntil)>120)
+ throw new IllegalArgumentException("The validity period is longer than 2 hours");
+ JsonArray signatures=token.getAsJsonArray("signatures");
+ JsonObject rsaSignature=null;
+ for(JsonElement _sig:signatures){
+ JsonObject sig=_sig.getAsJsonObject();
+ if("rsa-sha256".equals(sig.getAsJsonPrimitive("algorithm").getAsString())){
+ rsaSignature=sig;
+ break;
+ }
+ }
+ if(rsaSignature==null)
+ throw new IllegalArgumentException("Signature with 'rsa-sha256' algorithm not found");
+ byte[] signature=Base64.getDecoder().decode(rsaSignature.getAsJsonPrimitive("signature").getAsString());
+ String sigStr=generateActorTokenStringToBeSigned(token);
+ Signature sig=Signature.getInstance("SHA256withRSA");
+ sig.initVerify(group.publicKey);
+ sig.update(sigStr.getBytes(StandardCharsets.UTF_8));
+ if(!sig.verify(signature)){
+ throw new IllegalArgumentException("Actor token signature failed to verify");
+ }
+ LOG.debug("Successfully verified actor token {}", token);
+ }catch(Exception x){
+ throw new UserActionNotAllowedException("Actor token is not valid: "+x.getMessage(), x);
+ }
+ }
+
+ public static JsonObject fetchActorToken(@NotNull ApplicationContext context, @NotNull Actor actor, @NotNull ForeignGroup group){
+ String url=Objects.requireNonNull(group.actorTokenEndpoint).toString();
+ Request.Builder builder=new Request.Builder()
+ .url(url);
+ signRequest(builder, group.actorTokenEndpoint, actor, null, "get");
+ Call call=httpClient.newCall(builder.build());
+ try(Response resp=call.execute()){
+ if(resp.isSuccessful()){
+ JsonObject obj=JsonParser.parseReader(resp.body().charStream()).getAsJsonObject();
+ verifyActorToken(obj, actor, group);
+ return obj;
+ }else{
+ LOG.warn("Response for actor token for user {} in group {} was not successful: {}", actor.activityPubID, group.activityPubID, resp);
+ }
+ }catch(Exception x){
+ LOG.warn("Error fetching actor token for user {} in group {}", actor.activityPubID, group.activityPubID, x);
+ }
+ return null;
+ }
+
+ public static CollectionQueryResult performCollectionQuery(@NotNull Actor actor, @NotNull URI collectionID, @NotNull Collection query){
+ actor.ensureRemote();
+ if(actor.collectionQueryEndpoint==null)
+ throw new IllegalArgumentException("This actor does not have a collection query endpoint");
+ if(!collectionID.getHost().equals(actor.activityPubID.getHost()))
+ throw new IllegalArgumentException("Collection ID and actor ID hostnames don't match");
+ if(query.isEmpty())
+ throw new IllegalArgumentException("Query is empty");
+ Request.Builder builder=new Request.Builder()
+ .url(HttpUrl.get(actor.collectionQueryEndpoint.toString()));
+ FormBody.Builder body=new FormBody.Builder().add("collection", collectionID.toString());
+ for(URI uri:query)
+ body.add("item", uri.toString());
+ builder.post(body.build());
+ signRequest(builder, actor.collectionQueryEndpoint, actor, null, "post");
+ try(Response resp=httpClient.newCall(builder.build()).execute()){
+ if(resp.isSuccessful()){
+ JsonElement el=JsonParser.parseReader(resp.body().charStream());
+ JsonObject converted=JLDProcessor.convertToLocalContext(el.getAsJsonObject());
+ ActivityPubObject aobj=ActivityPubObject.parse(converted);
+ if(aobj==null)
+ throw new UnsupportedRemoteObjectTypeException("Unsupported object type "+converted.get("type"));
+ if(aobj instanceof CollectionQueryResult cqr){
+ if(!collectionID.equals(cqr.partOf))
+ throw new FederationException("part_of in the collection query result '"+cqr.partOf+"' does not match expected '"+collectionID+"'");
+ return cqr;
+ }else{
+ throw new UnsupportedRemoteObjectTypeException("Expected object of type sm:CollectionQueryResult, got "+aobj.getType());
+ }
+ }else{
+ LOG.warn("Response for collection query {} was not successful: {}", collectionID, resp);
+ return CollectionQueryResult.empty(collectionID);
+ }
+ }catch(Exception x){
+ LOG.warn("Error querying collection {}", collectionID, x);
+ return CollectionQueryResult.empty(collectionID);
+ }
+ }
}
diff --git a/src/main/java/smithereen/activitypub/ActivityPubWorker.java b/src/main/java/smithereen/activitypub/ActivityPubWorker.java
index 61d5f05a..abb81f20 100644
--- a/src/main/java/smithereen/activitypub/ActivityPubWorker.java
+++ b/src/main/java/smithereen/activitypub/ActivityPubWorker.java
@@ -1,36 +1,35 @@
package smithereen.activitypub;
+import com.google.gson.JsonObject;
+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.net.URI;
import java.sql.SQLException;
+import java.time.Instant;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
-import java.util.Date;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
+import java.util.Objects;
import java.util.Random;
import java.util.Set;
import java.util.concurrent.Callable;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
import java.util.concurrent.ForkJoinPool;
import java.util.concurrent.ForkJoinTask;
import java.util.concurrent.Future;
-import java.util.concurrent.FutureTask;
+import java.util.concurrent.RecursiveAction;
import java.util.concurrent.RecursiveTask;
import java.util.function.Consumer;
-import java.util.stream.Collectors;
+import smithereen.ApplicationContext;
import smithereen.Config;
-import smithereen.ObjectLinkResolver;
import smithereen.Utils;
import smithereen.activitypub.objects.Activity;
import smithereen.activitypub.objects.ActivityPubCollection;
-import smithereen.activitypub.objects.ActivityPubObject;
import smithereen.activitypub.objects.Actor;
import smithereen.activitypub.objects.CollectionPage;
import smithereen.activitypub.objects.LinkOrObject;
@@ -40,6 +39,9 @@
import smithereen.activitypub.objects.activities.Create;
import smithereen.activitypub.objects.activities.Delete;
import smithereen.activitypub.objects.activities.Follow;
+import smithereen.activitypub.objects.activities.Invite;
+import smithereen.activitypub.objects.activities.Join;
+import smithereen.activitypub.objects.activities.Leave;
import smithereen.activitypub.objects.activities.Like;
import smithereen.activitypub.objects.activities.Offer;
import smithereen.activitypub.objects.activities.Reject;
@@ -56,37 +58,45 @@
import smithereen.data.UriBuilder;
import smithereen.data.User;
import smithereen.data.notifications.NotificationUtils;
+import smithereen.exceptions.FederationException;
+import smithereen.exceptions.InternalServerErrorException;
import smithereen.storage.GroupStorage;
import smithereen.storage.PostStorage;
import smithereen.storage.UserStorage;
import spark.utils.StringUtils;
public class ActivityPubWorker{
- private static ActivityPubWorker instance;
private static final Logger LOG=LoggerFactory.getLogger(ActivityPubWorker.class);
+ /**
+ * Will not fetch more than this many comments
+ */
private static final int MAX_COMMENTS=1000;
+ /**
+ * Will not fetch more than this many friends (or followers/following if there's no friends collection)
+ */
+ private static final int MAX_FRIENDS=10_000;
+ private static final int ACTORS_BATCH_SIZE=25;
+
+ private final ForkJoinPool executor;
+ private final Random rand=new Random();
- private ForkJoinPool executor;
- private Random rand=new Random();
+ // These must be accessed from synchronized(this)
private HashMap>> fetchingReplyThreads=new HashMap<>();
private HashMap>>> afterFetchReplyThreadActions=new HashMap<>();
private HashMap> fetchingAllReplies=new HashMap<>();
+ private HashSet fetchingRelationshipCollectionsActors=new HashSet<>();
+ private HashSet fetchingContentCollectionsActors=new HashSet<>();
- public static ActivityPubWorker getInstance(){
- if(instance==null)
- instance=new ActivityPubWorker();
- return instance;
- }
+ private final ApplicationContext context;
- private ActivityPubWorker(){
+ public ActivityPubWorker(ApplicationContext context){
+ this.context=context;
executor=new ForkJoinPool(Runtime.getRuntime().availableProcessors()*2);
}
- public static void shutDown(){
- if(instance==null)
- return;
+ public void shutDown(){
LOG.info("Stopping thread pool");
- Utils.stopExecutorBlocking(instance.executor, LOG);
+ Utils.stopExecutorBlocking(executor, LOG);
LOG.info("Stopped");
}
@@ -112,27 +122,27 @@ public void forwardActivity(String json, User signer, List inboxes, String
private List getInboxesForPost(Post post) throws SQLException{
ArrayList inboxes=new ArrayList<>();
- if(post.owner instanceof User){
- boolean sendToFollowers=((User) post.owner).id==post.user.id;
- if(post.owner instanceof ForeignUser){
- inboxes.add(actorInbox((ForeignUser) post.owner));
+ if(post.owner instanceof User user){
+ boolean sendToFollowers=user.id==post.user.id;
+ if(post.owner instanceof ForeignUser foreignUser){
+ inboxes.add(actorInbox(foreignUser));
}else if(sendToFollowers && post.getReplyLevel()==0){
- inboxes.addAll(UserStorage.getFollowerInboxes(((User) post.owner).id));
+ inboxes.addAll(UserStorage.getFollowerInboxes(user.id));
}else{
inboxes.addAll(PostStorage.getInboxesForPostInteractionForwarding(post));
}
- }else if(post.owner instanceof Group){
- if(post.owner instanceof ForeignGroup){
- inboxes.add(actorInbox((ForeignGroup) post.owner));
+ }else if(post.owner instanceof Group group){
+ if(post.owner instanceof ForeignGroup foreignGroup){
+ inboxes.add(actorInbox(foreignGroup));
}else if(post.getReplyLevel()==0){
- inboxes.addAll(GroupStorage.getGroupMemberInboxes(((Group) post.owner).id));
+ inboxes.addAll(GroupStorage.getGroupMemberInboxes(group.id));
}else{
inboxes.addAll(PostStorage.getInboxesForPostInteractionForwarding(post));
}
}
for(User user:post.mentionedUsers){
- if(user instanceof ForeignUser){
- URI inbox=actorInbox((ForeignUser) user);
+ if(user instanceof ForeignUser foreignUser){
+ URI inbox=actorInbox(foreignUser);
if(!inboxes.contains(inbox))
inboxes.add(inbox);
}
@@ -153,113 +163,104 @@ private void sendActivityForPost(Post post, Activity activity, Actor actor){
}
public void sendCreatePostActivity(final Post post){
- executor.submit(new Runnable(){
- @Override
- public void run(){
- Create create=new Create();
- create.object=new LinkOrObject(post);
- create.actor=new LinkOrObject(post.user.activityPubID);
- create.to=post.to;
- create.cc=post.cc;
- create.published=post.published;
- create.activityPubID=Config.localURI(post.activityPubID.getPath()+"/activityCreate");
- sendActivityForPost(post, create, post.user);
- }
+ executor.submit(()->{
+ Create create=new Create();
+ create.object=new LinkOrObject(post);
+ create.actor=new LinkOrObject(post.user.activityPubID);
+ create.to=post.to;
+ create.cc=post.cc;
+ create.published=post.published;
+ create.activityPubID=Config.localURI(post.activityPubID.getPath()+"/activityCreate");
+ sendActivityForPost(post, create, post.user);
});
}
public void sendUpdatePostActivity(final Post post){
- executor.submit(new Runnable(){
- @Override
- public void run(){
- Update update=new Update();
- update.object=new LinkOrObject(post);
- update.actor=new LinkOrObject(post.user.activityPubID);
- update.to=post.to;
- update.cc=post.cc;
- update.published=post.updated;
- update.activityPubID=Config.localURI(post.activityPubID.getPath()+"#update_"+rand());
- sendActivityForPost(post, update, post.user);
- }
+ executor.submit(()->{
+ Update update=new Update();
+ update.object=new LinkOrObject(post);
+ update.actor=new LinkOrObject(post.user.activityPubID);
+ update.to=post.to;
+ update.cc=post.cc;
+ update.published=post.updated;
+ update.activityPubID=Config.localURI(post.activityPubID.getPath()+"#update_"+rand());
+ sendActivityForPost(post, update, post.user);
});
}
public void sendAddPostToWallActivity(final Post post){
- executor.submit(new Runnable(){
- @Override
- public void run(){
- try{
- Add add=new Add();
- add.activityPubID=UriBuilder.local().path("posts", post.id+"", "activityAdd").build();
- add.object=new LinkOrObject(post.activityPubID);
- add.actor=new LinkOrObject(post.owner.activityPubID);
- add.to=List.of(new LinkOrObject(ActivityPub.AS_PUBLIC), new LinkOrObject(post.owner.getFollowersURL()), new LinkOrObject(post.user.activityPubID));
- if(!post.mentionedUsers.isEmpty()){
- ArrayList cc=new ArrayList<>();
- for(User user : post.mentionedUsers){
- cc.add(new LinkOrObject(user.activityPubID));
- }
- add.cc=cc;
- }
- add.target=new LinkOrObject(post.owner.getWallURL());
-
- ArrayList inboxes=new ArrayList<>();
- if(post.owner instanceof User)
- inboxes.addAll(UserStorage.getFollowerInboxes(((User) post.owner).id));
- else
- inboxes.addAll(GroupStorage.getGroupMemberInboxes(((Group) post.owner).id));
-
- for(User user:post.mentionedUsers){
- if(user instanceof ForeignUser){
- URI inbox=actorInbox((ForeignUser) user);
- if(!inboxes.contains(inbox))
- inboxes.add(inbox);
- }
+ executor.submit(()->{
+ try{
+ Add add=new Add();
+ add.activityPubID=UriBuilder.local().path("posts", post.id+"", "activityAdd").build();
+ add.object=new LinkOrObject(post.activityPubID);
+ add.actor=new LinkOrObject(post.owner.activityPubID);
+ add.to=List.of(new LinkOrObject(ActivityPub.AS_PUBLIC), new LinkOrObject(post.owner.getFollowersURL()), new LinkOrObject(post.user.activityPubID));
+ if(!post.mentionedUsers.isEmpty()){
+ ArrayList cc=new ArrayList<>();
+ for(User user : post.mentionedUsers){
+ cc.add(new LinkOrObject(user.activityPubID));
}
- if(post.user instanceof ForeignUser){
- URI inbox=actorInbox((ForeignUser) post.user);
+ add.cc=cc;
+ }
+ ActivityPubCollection target=new ActivityPubCollection(false);
+ target.activityPubID=post.owner.getWallURL();
+ target.attributedTo=post.owner.activityPubID;
+ add.target=new LinkOrObject(target);
+
+ ArrayList inboxes=new ArrayList<>();
+ if(post.owner instanceof User)
+ inboxes.addAll(UserStorage.getFollowerInboxes(((User) post.owner).id));
+ else
+ inboxes.addAll(GroupStorage.getGroupMemberInboxes(((Group) post.owner).id));
+
+ for(User user:post.mentionedUsers){
+ if(user instanceof ForeignUser){
+ URI inbox=actorInbox((ForeignUser) user);
if(!inboxes.contains(inbox))
inboxes.add(inbox);
}
+ }
+ if(post.user instanceof ForeignUser){
+ URI inbox=actorInbox((ForeignUser) post.user);
+ if(!inboxes.contains(inbox))
+ inboxes.add(inbox);
+ }
- for(URI inbox:inboxes){
- executor.submit(new SendOneActivityRunnable(add, inbox, post.owner));
- }
- }catch(SQLException x){
- LOG.error("Exception while sending wall post {}", post.activityPubID, x);
+ for(URI inbox:inboxes){
+ executor.submit(new SendOneActivityRunnable(add, inbox, post.owner));
}
+ }catch(SQLException x){
+ LOG.error("Exception while sending wall post {}", post.activityPubID, x);
}
});
}
public void sendDeletePostActivity(final Post post, final User actualActor){
- executor.submit(new Runnable(){
- @Override
- public void run(){
- Actor actor;
- Delete delete=new Delete();
- delete.object=new LinkOrObject(post.activityPubID);
- if(post.user.id==actualActor.id)
- actor=actualActor;
- else if(!post.isGroupOwner() && ((User)post.owner).id==actualActor.id)
- actor=actualActor;
- else if(post.isGroupOwner())
- actor=post.owner;
- else{
- LOG.error("Shouldn't happen: post {} actor for delete can't be chosen", post.id);
- return;
- }
- if(actor instanceof ForeignGroup || actor instanceof ForeignUser){
- LOG.error("Shouldn't happen: {} actor for delete is a foreign actor", post.id);
- return;
- }
- delete.actor=new LinkOrObject(actor.activityPubID);
- delete.to=post.to;
- delete.cc=post.cc;
- delete.published=new Date();
- delete.activityPubID=new UriBuilder(post.activityPubID).appendPath("delete").build();
- sendActivityForPost(post, delete, actor);
+ executor.submit(()->{
+ Actor actor;
+ Delete delete=new Delete();
+ delete.object=new LinkOrObject(post.activityPubID);
+ if(post.user.id==actualActor.id)
+ actor=actualActor;
+ else if(!post.isGroupOwner() && ((User)post.owner).id==actualActor.id)
+ actor=actualActor;
+ else if(post.isGroupOwner())
+ actor=post.owner;
+ else{
+ LOG.error("Shouldn't happen: post {} actor for delete can't be chosen", post.id);
+ return;
}
+ if(actor instanceof ForeignGroup || actor instanceof ForeignUser){
+ LOG.error("Shouldn't happen: {} actor for delete is a foreign actor", post.id);
+ return;
+ }
+ delete.actor=new LinkOrObject(actor.activityPubID);
+ delete.to=post.to;
+ delete.cc=post.cc;
+ delete.published=Instant.now();
+ delete.activityPubID=new UriBuilder(post.activityPubID).appendPath("delete").build();
+ sendActivityForPost(post, delete, actor);
});
}
@@ -313,12 +314,13 @@ public void sendAddToFriendsCollectionActivity(User self, User friend){
}
}
- public void sendAddToGroupsCollectionActivity(User self, Group group){
+ public void sendAddToGroupsCollectionActivity(User self, Group group, boolean tentative){
Add add=new Add();
add.activityPubID=new UriBuilder(self.activityPubID).fragment("addGroupCollection"+group.id+"_"+rand()).build();
add.actor=new LinkOrObject(self.activityPubID);
add.object=new LinkOrObject(group.activityPubID);
add.target=new LinkOrObject(self.getGroupsURL());
+ add.tentative=tentative;
try{
List inboxes=UserStorage.getFollowerInboxes(self.id);
@@ -347,7 +349,7 @@ public void sendRemoveFromGroupsCollectionActivity(User self, Group group){
}
}
- public void sendFollowActivity(User self, ForeignUser target){
+ public void sendFollowUserActivity(User self, ForeignUser target){
Follow follow=new Follow();
follow.actor=new LinkOrObject(self.activityPubID);
follow.object=new LinkOrObject(target.activityPubID);
@@ -355,25 +357,34 @@ public void sendFollowActivity(User self, ForeignUser target){
executor.submit(new SendOneActivityRunnable(follow, target.inbox, self));
}
- public void sendFollowActivity(User self, ForeignGroup target){
- Follow follow=new Follow();
+ public void sendJoinGroupActivity(User self, ForeignGroup target, boolean tentative){
+ Activity follow;
+ if(target.hasCapability(ForeignGroup.Capability.JOIN_LEAVE_ACTIVITIES))
+ follow=new Join(tentative);
+ else
+ follow=new Follow();
follow.actor=new LinkOrObject(self.activityPubID);
follow.object=new LinkOrObject(target.activityPubID);
follow.activityPubID=new UriBuilder(self.activityPubID).fragment("joinGroup"+target.id+"_"+rand()).build();
executor.submit(new SendOneActivityRunnable(follow, target.inbox, self));
}
- public void sendUnfollowActivity(User self, ForeignGroup target){
- Undo undo=new Undo();
+ public void sendLeaveGroupActivity(User self, ForeignGroup target){
+ Activity undo;
+ if(target.hasCapability(ForeignGroup.Capability.JOIN_LEAVE_ACTIVITIES)){
+ undo=new Leave();
+ undo.object=new LinkOrObject(target.activityPubID);
+ }else{
+ undo=new Undo();
+ Follow follow=new Follow();
+ follow.actor=new LinkOrObject(self.activityPubID);
+ follow.object=new LinkOrObject(target.activityPubID);
+ follow.activityPubID=new UriBuilder(self.activityPubID).fragment("joinGroup"+target.id+"_"+rand()).build();
+ undo.object=new LinkOrObject(follow);
+ }
undo.activityPubID=new UriBuilder(self.activityPubID).fragment("leaveGroup"+target.id+"_"+rand()).build();
undo.actor=new LinkOrObject(self.activityPubID);
- Follow follow=new Follow();
- follow.actor=new LinkOrObject(self.activityPubID);
- follow.object=new LinkOrObject(target.activityPubID);
- follow.activityPubID=new UriBuilder(self.activityPubID).fragment("joinGroup"+target.id+"_"+rand()).build();
- undo.object=new LinkOrObject(follow);
-
executor.submit(new SendOneActivityRunnable(undo, target.inbox, self));
}
@@ -484,7 +495,7 @@ public void sendUndoLikeActivity(Post post, User user, int likeID) throws SQLExc
}
}
- public void sendBlockActivity(Actor self, ForeignUser target) throws SQLException{
+ public void sendBlockActivity(Actor self, ForeignUser target){
Block block=new Block();
block.activityPubID=new UriBuilder(self.activityPubID).fragment("blockUser"+target.id+"_"+System.currentTimeMillis()).build();
block.actor=new LinkOrObject(self.activityPubID);
@@ -492,7 +503,7 @@ public void sendBlockActivity(Actor self, ForeignUser target) throws SQLExceptio
executor.submit(new SendOneActivityRunnable(block, target.inbox, self));
}
- public void sendUndoBlockActivity(Actor self, ForeignUser target) throws SQLException{
+ public void sendUndoBlockActivity(Actor self, ForeignUser target){
Block block=new Block();
block.activityPubID=new UriBuilder(self.activityPubID).fragment("blockUser"+target.id+"_"+System.currentTimeMillis()).build();
block.actor=new LinkOrObject(self.activityPubID);
@@ -530,12 +541,127 @@ public void sendPollVotes(User self, Poll poll, Actor pollOwner, List> fetchReplyThread(Post post){
return fetchingReplyThreads.computeIfAbsent(post.activityPubID, (uri)->executor.submit(new FetchReplyThreadRunnable(post)));
}
@@ -549,6 +675,38 @@ public synchronized Future fetchAllReplies(Post post){
return fetchingAllReplies.computeIfAbsent(post.activityPubID, (uri)->executor.submit(new FetchAllRepliesTask(post)));
}
+ /**
+ * Fetch and store actor's collections that are related to relationships.
+ * For users, that's friends. For groups, that's members and tentative members.
+ * @param actor the remote actor
+ */
+ public synchronized void fetchActorRelationshipCollections(Actor actor){
+ LOG.info("Fetching relationship collections for actor {}", actor.activityPubID);
+ actor.ensureRemote();
+ if(fetchingRelationshipCollectionsActors.contains(actor.activityPubID)){
+ LOG.trace("Another fetch is already in progress for {}", actor.activityPubID);
+ return;
+ }
+ fetchingRelationshipCollectionsActors.add(actor.activityPubID);
+ executor.submit(new FetchActorRelationshipCollectionsTask(actor));
+ }
+
+ /**
+ * Fetch and store actor's collections that are related to its content.
+ * Currently, that's only the wall with all comments.
+ * @param actor the remote actor
+ */
+ public synchronized void fetchActorContentCollections(Actor actor){
+ LOG.info("Fetching content collections for actor {}", actor.activityPubID);
+ actor.ensureRemote();
+ if(fetchingContentCollectionsActors.contains(actor.activityPubID)){
+ LOG.trace("Another fetch is already in progress for {}", actor.activityPubID);
+ return;
+ }
+ fetchingContentCollectionsActors.add(actor.activityPubID);
+ executor.submit(new FetchActorContentCollectionsTask(actor));
+ }
+
private static class SendOneActivityRunnable implements Runnable{
private Activity activity;
private URI destination;
@@ -613,7 +771,7 @@ public void run(){
}
}
- private static class FetchReplyThreadRunnable implements Callable>{
+ private class FetchReplyThreadRunnable implements Callable>{
private ArrayList thread=new ArrayList<>();
private Set seenPosts=new HashSet<>();
private Post initialPost;
@@ -628,7 +786,7 @@ public List call() throws Exception{
LOG.debug("Started fetching parent thread for post {}", initialPost.activityPubID);
seenPosts.add(initialPost.activityPubID);
while(thread.get(0).inReplyTo!=null){
- Post post=ObjectLinkResolver.resolve(thread.get(0).inReplyTo, Post.class, true, false, false);
+ Post post=context.getObjectLinkResolver().resolve(thread.get(0).inReplyTo, Post.class, true, false, false, (JsonObject) null, true);
if(seenPosts.contains(post.activityPubID)){
LOG.warn("Already seen post {} while fetching parent thread for {}", post.activityPubID, initialPost.activityPubID);
throw new IllegalStateException("Reply thread contains a loop of links");
@@ -641,7 +799,7 @@ public List call() throws Exception{
Post p=thread.get(i);
if(p.id!=0)
continue;
- p.storeDependencies();
+ p.storeDependencies(context);
Post prev=null;
if(i>0){
prev=thread.get(i-1);
@@ -651,17 +809,17 @@ public List call() throws Exception{
p.content=Utils.sanitizeHTML(p.content);
if(StringUtils.isNotEmpty(p.summary))
p.summary=Utils.sanitizeHTML(p.summary);
- Utils.loadAndPreprocessRemotePostMentions(p);
+ context.getWallController().loadAndPreprocessRemotePostMentions(p);
PostStorage.putForeignWallPost(p);
NotificationUtils.putNotificationsForPost(p, prev);
}
LOG.info("Done fetching parent thread for post {}", topLevel.activityPubID);
- synchronized(instance){
- instance.fetchingReplyThreads.remove(initialPost.activityPubID);
- List>> actions=instance.afterFetchReplyThreadActions.remove(initialPost.activityPubID);
+ synchronized(ActivityPubWorker.this){
+ fetchingReplyThreads.remove(initialPost.activityPubID);
+ List>> actions=afterFetchReplyThreadActions.remove(initialPost.activityPubID);
if(actions!=null){
for(Consumer> action:actions){
- instance.executor.submit(()->action.accept(thread));
+ executor.submit(()->action.accept(thread));
}
}
return thread;
@@ -669,7 +827,7 @@ public List call() throws Exception{
}
}
- private static class FetchAllRepliesTask extends RecursiveTask{
+ private class FetchAllRepliesTask extends RecursiveTask{
protected Post post;
/**
* This keeps track of all the posts we've seen in this comment thread, to prevent a DoS via infinite recursion.
@@ -701,7 +859,7 @@ protected Post compute(){
}else{
ActivityPubCollection collection;
if(post.replies.link!=null){
- collection=ObjectLinkResolver.resolve(post.replies.link, ActivityPubCollection.class, true, false, false);
+ collection=context.getObjectLinkResolver().resolve(post.replies.link, ActivityPubCollection.class, true, false, false, post.owner, true);
collection.validate(post.activityPubID, "replies");
}else if(post.replies.object instanceof ActivityPubCollection){
collection=(ActivityPubCollection) post.replies.object;
@@ -716,7 +874,7 @@ protected Post compute(){
}
CollectionPage page;
if(collection.first.link!=null){
- page=ObjectLinkResolver.resolve(collection.first.link, CollectionPage.class, true, false, false);
+ page=context.getObjectLinkResolver().resolve(collection.first.link, CollectionPage.class, true, false, false, post.owner, false);
page.validate(post.activityPubID, "replies.first");
}else if(collection.first.object instanceof CollectionPage){
page=(CollectionPage) collection.first.object;
@@ -730,7 +888,7 @@ protected Post compute(){
}
while(page.next!=null){
LOG.trace("getting next page: {}", page.next);
- page=ObjectLinkResolver.resolve(page.next, CollectionPage.class, true, false, false);
+ page=context.getObjectLinkResolver().resolve(page.next, CollectionPage.class, true, false, false, post.owner, false);
if(page.items==null){ // you're supposed to not return the "next" field when there are no more pages, but mastodon still does...
LOG.debug("done fetching replies because page.items is empty");
break;
@@ -742,8 +900,8 @@ protected Post compute(){
completeExceptionally(x);
}
if(post.getReplyLevel()==0){
- synchronized(instance){
- instance.fetchingAllReplies.remove(post.activityPubID);
+ synchronized(ActivityPubWorker.this){
+ fetchingAllReplies.remove(post.activityPubID);
return post;
}
}
@@ -783,7 +941,7 @@ private void doOneCollectionPage(List page) throws Exception{
}
post=(Post) item.object;
post.setParent(this.post);
- post.resolveDependencies(true, true);
+ post.resolveDependencies(context, true, true);
PostStorage.putForeignWallPost(post);
LOG.trace("got post: {}", post);
FetchAllRepliesTask subtask=new FetchAllRepliesTask(post, seenPosts);
@@ -805,7 +963,7 @@ private void doOneCollectionPage(List page) throws Exception{
}
}
- private static class FetchPostAndRepliesTask extends FetchAllRepliesTask{
+ private class FetchPostAndRepliesTask extends FetchAllRepliesTask{
private URI postID;
private Post parentPost;
@@ -819,9 +977,9 @@ public FetchPostAndRepliesTask(URI postID, Post parentPost, Set seenPosts){
protected Post compute(){
try{
LOG.trace("Fetching remote reply from {}", postID);
- post=ObjectLinkResolver.resolve(postID, Post.class, true, false, false);
+ post=context.getObjectLinkResolver().resolve(postID, Post.class, true, false, false, parentPost.owner, true);
post.setParent(parentPost);
- post.storeDependencies();
+ post.storeDependencies(context);
PostStorage.putForeignWallPost(post);
}catch(Exception x){
completeExceptionally(x);
@@ -829,4 +987,416 @@ protected Post compute(){
return super.compute();
}
}
+
+ private class FetchActorRelationshipCollectionsTask extends RecursiveAction{
+ private final Actor actor;
+
+ private FetchActorRelationshipCollectionsTask(Actor actor){
+ this.actor=actor;
+ }
+
+ @Override
+ protected void compute(){
+ List> tasks=new ArrayList<>();
+ // TODO also sync removed items
+ if(actor instanceof ForeignUser user){
+ if(user.getFriendsURL()!=null){
+ tasks.add(new FetchUserFriendsDirectlyTask(user));
+ if(user.getGroupsURL()!=null){
+ tasks.add(new FetchUserGroupsDirectlyTask(user));
+ }
+ }else{
+ tasks.add(new FetchUserFriendsAndGroupsViaFollowsTask(user));
+ }
+ }else if(actor instanceof ForeignGroup group){
+ tasks.add(new FetchGroupMembersTask(group, false));
+ if(group.isEvent() && group.tentativeMembers!=null)
+ tasks.add(new FetchGroupMembersTask(group, true));
+ }
+ try{
+ invokeAll(tasks);
+ }catch(Throwable x){
+ LOG.warn("Error fetching relationship collections for {}", actor.activityPubID, x);
+ }
+ synchronized(ActivityPubWorker.this){
+ fetchingRelationshipCollectionsActors.remove(actor.activityPubID);
+ }
+ LOG.info("Done fetching relationship collections for {}", actor.activityPubID);
+ }
+ }
+
+ private class FetchActorContentCollectionsTask extends RecursiveAction{
+ private final Actor actor;
+
+ private FetchActorContentCollectionsTask(Actor actor){
+ this.actor=actor;
+ }
+
+ @Override
+ protected void compute(){
+ List> tasks=new ArrayList<>();
+ if(actor.hasWall()){
+ tasks.add(new FetchActorWallTask(actor));
+ }
+ try{
+ invokeAll(tasks);
+ }catch(Throwable x){
+ LOG.warn("Error fetching content collections for {}", actor.activityPubID, x);
+ }
+ synchronized(ActivityPubWorker.this){
+ fetchingContentCollectionsActors.remove(actor.activityPubID);
+ }
+ LOG.info("Done fetching content collections for {}", actor.activityPubID);
+ }
+ }
+
+ /**
+ * Base class for tasks that deal with collections. Handles paginating through a collection.
+ */
+ private abstract class ForwardPaginatingCollectionTask extends RecursiveAction{
+ protected final URI collectionID;
+ protected ActivityPubCollection collection;
+ protected int totalItems, processedItems;
+ protected int maxItems=Integer.MAX_VALUE;
+
+ private ForwardPaginatingCollectionTask(URI collectionID){
+ this.collectionID=Objects.requireNonNull(collectionID);
+ }
+
+ private ForwardPaginatingCollectionTask(ActivityPubCollection collection){
+ this.collection=collection;
+ collectionID=collection.activityPubID;
+ }
+
+ @Override
+ protected void compute(){
+ if(collection==null){
+ LOG.trace("Fetching collection {}", collectionID);
+ collection=context.getObjectLinkResolver().resolve(collectionID, ActivityPubCollection.class, true, false, false);
+ }
+ totalItems=Math.min(collection.totalItems, maxItems);
+ onCollectionLoaded();
+ if(collection.first==null)
+ throw new FederationException("collection.first is not present");
+ if(collection.first.object!=null)
+ processCollectionPage(collection.first.requireObject());
+ else
+ loadNextCollectionPage(collection.first.link);
+ }
+
+ private void loadNextCollectionPage(URI id){
+ LOG.trace("Fetching page {} for collection {}", id, collectionID);
+ CollectionPage page=context.getObjectLinkResolver().resolve(id, CollectionPage.class, true, false, false);
+ processCollectionPage(page);
+ }
+
+ private void processCollectionPage(CollectionPage page){
+ if(page.items==null || page.items.isEmpty()){
+ LOG.trace("Finished processing collection {} because items array was null or empty", collectionID);
+ return;
+ }
+ doOneCollectionPage(page);
+ processedItems+=page.items.size();
+ if(totalItems>=0 && processedItems>=totalItems){
+ LOG.trace("Finished processing collection {} because item count limit {} was reached", collectionID, totalItems);
+ return;
+ }
+ if(page.next!=null){
+ loadNextCollectionPage(page.next);
+ }else{
+ LOG.trace("Finished processing collection {} because there are no next pages", collectionID);
+ }
+ }
+
+ protected abstract void doOneCollectionPage(CollectionPage page);
+
+ protected void onCollectionLoaded(){}
+ }
+
+ /**
+ * Fetches the user's friends collection directly, assuming there is one
+ */
+ private class FetchUserFriendsDirectlyTask extends ForwardPaginatingCollectionTask{
+ private final ForeignUser user;
+
+ private FetchUserFriendsDirectlyTask(ForeignUser user){
+ super(Objects.requireNonNull(user.getFriendsURL(), "user must have a friends collection"));
+ this.user=user;
+ maxItems=MAX_FRIENDS;
+ }
+
+ protected void doOneCollectionPage(CollectionPage page){
+ invokeAll(page.items.stream()
+ .filter(lo->lo.link!=null && !Config.isLocal(lo.link))
+ .map(lo->new FetchAndStoreOneUserFolloweeTask(user, lo.link, ForeignUser.class))
+ .toList());
+ }
+ }
+
+ /**
+ * Fetches the user's friends collection directly, assuming there is one
+ */
+ private class FetchUserGroupsDirectlyTask extends ForwardPaginatingCollectionTask{
+ private final ForeignUser user;
+
+ private FetchUserGroupsDirectlyTask(ForeignUser user){
+ super(Objects.requireNonNull(user.getGroupsURL(), "user must have a groups collection"));
+ this.user=user;
+ maxItems=MAX_FRIENDS;
+ }
+
+ protected void doOneCollectionPage(CollectionPage page){
+ invokeAll(page.items.stream()
+ .filter(lo->lo.link!=null && !Config.isLocal(lo.link))
+ .map(lo->new FetchAndStoreOneUserFolloweeTask(user, lo.link, ForeignGroup.class))
+ .toList());
+ }
+ }
+
+ /**
+ * Fetches the user's friends and groups by intersecting followers and following
+ */
+ private class FetchUserFriendsAndGroupsViaFollowsTask extends RecursiveAction{
+ private final ForeignUser user;
+
+ private FetchUserFriendsAndGroupsViaFollowsTask(ForeignUser user){
+ this.user=user;
+ }
+
+ @Override
+ protected void compute(){
+ if(user.followers==null || user.following==null)
+ throw new FederationException("The user must have followers and following collections");
+
+ ActivityPubCollection followers=context.getObjectLinkResolver().resolve(user.followers, ActivityPubCollection.class, true, false, false);
+ ActivityPubCollection following=context.getObjectLinkResolver().resolve(user.following, ActivityPubCollection.class, true, false, false);
+ LOG.trace("Fetch followers/following: collection sizes: {} followers, {} following", followers.totalItems, following.totalItems);
+
+ if(followers.totalItems<=0 || following.totalItems<=0){
+ LOG.debug("Can't proceed because collection sizes are not known");
+ return;
+ }
+ if(followers.totalItems>MAX_FRIENDS && following.totalItems>MAX_FRIENDS){
+ LOG.debug("Can't proceed because both followers and following exceed the limit of {}", MAX_FRIENDS);
+ return;
+ }
+
+ Set first=new HashSet<>();
+ new FetchCollectionIntoSetTask(followers.totalItems>following.totalItems ? following : followers, first).fork().join();
+ Set mutualFollows=new HashSet<>();
+ new FilterCollectionAgainstSetTask(followers.totalItems>following.totalItems ? followers : following, first, mutualFollows).fork().join();
+ List> tasks=new ArrayList<>();
+ for(URI uri:mutualFollows){
+ if(!Config.isLocal(uri)){
+ tasks.add(new FetchAndStoreOneUserFolloweeTask(user, uri, Actor.class));
+ }
+ if(tasks.size()==ACTORS_BATCH_SIZE){
+ invokeAll(tasks);
+ tasks.clear();
+ }
+ }
+ if(!tasks.isEmpty())
+ invokeAll(tasks);
+ }
+ }
+
+ private class FetchGroupMembersTask extends ForwardPaginatingCollectionTask{
+ private final ForeignGroup group;
+ private final boolean tentative;
+
+ private FetchGroupMembersTask(ForeignGroup group, boolean tentative){
+ super(tentative ? group.tentativeMembers : group.members);
+ this.group=group;
+ this.tentative=tentative;
+ }
+
+ @Override
+ protected void doOneCollectionPage(CollectionPage page){
+ invokeAll(page.items.stream()
+ .filter(lo->lo.link!=null && !Config.isLocal(lo.link))
+ .map(lo->new FetchAndStoreOneGroupMemberTask(group, lo.link, tentative))
+ .toList());
+ }
+
+ @Override
+ protected void onCollectionLoaded(){
+ try{
+ GroupStorage.setMemberCount(group, totalItems, tentative);
+ }catch(SQLException x){
+ throw new InternalServerErrorException(x);
+ }
+ }
+ }
+
+ private class FetchCollectionIntoSetTask extends ForwardPaginatingCollectionTask{
+ private final Set set;
+
+ private FetchCollectionIntoSetTask(ActivityPubCollection collection, Set set){
+ super(collection);
+ this.set=set;
+ }
+
+ @Override
+ protected void doOneCollectionPage(CollectionPage page){
+ for(LinkOrObject lo:page.items){
+ if(lo.link!=null)
+ set.add(lo.link);
+ }
+ }
+ }
+
+ private class FilterCollectionAgainstSetTask extends ForwardPaginatingCollectionTask{
+ private final Set filter;
+ private final Set result;
+
+ private FilterCollectionAgainstSetTask(ActivityPubCollection collection, Set filter, Set result){
+ super(collection);
+ this.filter=filter;
+ this.result=result;
+ }
+
+ @Override
+ protected void doOneCollectionPage(CollectionPage page){
+ for(LinkOrObject lo:page.items){
+ if(lo.link!=null && filter.contains(lo.link))
+ result.add(lo.link);
+ }
+ }
+ }
+
+ private class FetchAndStoreOneUserFolloweeTask extends RecursiveAction{
+ private final ForeignUser user;
+ private final URI targetActorID;
+ private final Class type;
+
+ private FetchAndStoreOneUserFolloweeTask(ForeignUser user, URI targetActorID, Class type){
+ this.user=user;
+ this.targetActorID=targetActorID;
+ this.type=type;
+ }
+
+ @Override
+ protected void compute(){
+ try{
+ Actor target=context.getObjectLinkResolver().resolve(targetActorID, type, true, false, false);
+ if(target instanceof ForeignUser targetUser){
+ if(targetUser.getFriendsURL()!=null)
+ context.getObjectLinkResolver().ensureObjectIsInCollection(targetUser, targetUser.getFriendsURL(), user.activityPubID);
+ if(targetUser.id==0)
+ context.getObjectLinkResolver().storeOrUpdateRemoteObject(targetUser);
+ context.getFriendsController().storeFriendship(user, targetUser);
+ }else if(target instanceof ForeignGroup targetGroup){
+ if(targetGroup.isEvent())
+ return;
+ if(targetGroup.members!=null)
+ context.getObjectLinkResolver().ensureObjectIsInCollection(targetGroup, targetGroup.members, user.activityPubID);
+ if(targetGroup.id==0)
+ context.getObjectLinkResolver().storeOrUpdateRemoteObject(targetGroup);
+ context.getGroupsController().joinGroup(targetGroup, user, false, true);
+ }
+ }catch(Exception x){
+ LOG.debug("Error fetching remote actor {}", targetActorID, x);
+ }
+ }
+ }
+
+ private class FetchAndStoreOneGroupMemberTask extends RecursiveAction{
+ private final ForeignGroup group;
+ private final URI userID;
+ private final boolean tentative;
+
+ private FetchAndStoreOneGroupMemberTask(ForeignGroup group, URI userID, boolean tentative){
+ this.group=group;
+ this.userID=userID;
+ this.tentative=tentative;
+ }
+
+ @Override
+ protected void compute(){
+ try{
+ ForeignUser user=context.getObjectLinkResolver().resolve(userID, ForeignUser.class, true, false, false);
+ if(user.getGroupsURL()!=null)
+ context.getObjectLinkResolver().ensureObjectIsInCollection(user, user.getGroupsURL(), group.activityPubID);
+ if(user.id==0)
+ context.getObjectLinkResolver().storeOrUpdateRemoteObject(user);
+ context.getGroupsController().joinGroup(group, user, tentative, true);
+ }catch(Exception x){
+ LOG.debug("Error fetching remote user {}", userID, x);
+ }
+ }
+ }
+
+ private class FetchActorWallTask extends ForwardPaginatingCollectionTask{
+ private final Actor actor;
+
+ private FetchActorWallTask(Actor actor){
+ super(actor.getWallURL());
+ this.actor=actor;
+ maxItems=MAX_COMMENTS;
+ }
+
+ @Override
+ protected void doOneCollectionPage(CollectionPage page){
+ ArrayList tasks=new ArrayList<>();
+ for(LinkOrObject lo:page.items){
+ try{
+ if(lo.object instanceof Post post){
+ if(post.inReplyTo==null)
+ tasks.add(new ProcessWallPostTask(post, actor));
+ }else if(lo.link!=null){
+ tasks.add(new FetchAndProcessWallPostTask(actor, lo.link));
+ }
+ }catch(Exception x){
+ LOG.debug("Error processing post {}", lo);
+ }
+ }
+ invokeAll(tasks);
+ }
+ }
+
+ private class ProcessWallPostTask extends RecursiveAction{
+ protected Post post;
+ protected final Actor owner;
+
+ private ProcessWallPostTask(Post post, Actor owner){
+ this.post=post;
+ this.owner=owner;
+ }
+
+ private ProcessWallPostTask(Actor owner){
+ this.owner=owner;
+ }
+
+ @Override
+ protected void compute(){
+ try{
+ post.resolveDependencies(context, true, true);
+ context.getObjectLinkResolver().storeOrUpdateRemoteObject(post);
+ new FetchAllRepliesTask(post).fork().join();
+ }catch(Exception x){
+ LOG.debug("Error processing post {}", post.id, x);
+ }
+ }
+ }
+
+ private class FetchAndProcessWallPostTask extends ProcessWallPostTask{
+ private final URI postID;
+
+ private FetchAndProcessWallPostTask(Actor owner, URI postID){
+ super(owner);
+ this.postID=postID;
+ }
+
+ @Override
+ protected void compute(){
+ try{
+ post=context.getObjectLinkResolver().resolve(postID, Post.class, true, false, false, owner, false);
+ if(post.inReplyTo!=null)
+ return;
+ }catch(Exception x){
+ LOG.debug("Error fetching post {}", postID, x);
+ }
+ super.compute();
+ }
+ }
}
diff --git a/src/main/java/smithereen/activitypub/handlers/AcceptFollowGroupHandler.java b/src/main/java/smithereen/activitypub/handlers/AcceptFollowGroupHandler.java
index 955cc99d..65a43800 100644
--- a/src/main/java/smithereen/activitypub/handlers/AcceptFollowGroupHandler.java
+++ b/src/main/java/smithereen/activitypub/handlers/AcceptFollowGroupHandler.java
@@ -2,16 +2,17 @@
import java.sql.SQLException;
-import smithereen.activitypub.ActivityPubWorker;
-import smithereen.activitypub.objects.Actor;
-import smithereen.exceptions.ObjectNotFoundException;
import smithereen.activitypub.ActivityHandlerContext;
import smithereen.activitypub.NestedActivityTypeHandler;
import smithereen.activitypub.objects.activities.Accept;
import smithereen.activitypub.objects.activities.Follow;
import smithereen.data.ForeignGroup;
+import smithereen.data.Group;
import smithereen.data.User;
+import smithereen.data.feed.NewsfeedEntry;
+import smithereen.exceptions.ObjectNotFoundException;
import smithereen.storage.GroupStorage;
+import smithereen.storage.NewsfeedStorage;
import smithereen.storage.UserStorage;
public class AcceptFollowGroupHandler extends NestedActivityTypeHandler{
@@ -21,7 +22,14 @@ public void handle(ActivityHandlerContext context, ForeignGroup actor, Accept ac
if(follower==null)
throw new ObjectNotFoundException("Follower not found");
follower.ensureLocal();
- GroupStorage.setMemberAccepted(actor.id, follower.id, true);
- ActivityPubWorker.getInstance().sendAddToGroupsCollectionActivity(follower, actor);
+ GroupStorage.setMemberAccepted(actor, follower.id, true);
+ if(object.accessType!=Group.AccessType.PRIVATE){
+ context.appContext.getActivityPubWorker().sendAddToGroupsCollectionActivity(follower, actor, context.appContext.getGroupsController().getUserMembershipState(object, follower)==Group.MembershipState.TENTATIVE_MEMBER);
+ NewsfeedStorage.putEntry(follower.id, object.id, object.isEvent() ? NewsfeedEntry.Type.JOIN_EVENT : NewsfeedEntry.Type.JOIN_GROUP, null);
+ }
+ if(GroupStorage.getLocalMembersCount(actor.id)==1){
+ context.appContext.getActivityPubWorker().fetchActorRelationshipCollections(actor);
+ context.appContext.getActivityPubWorker().fetchActorContentCollections(actor);
+ }
}
}
diff --git a/src/main/java/smithereen/activitypub/handlers/AcceptFollowPersonHandler.java b/src/main/java/smithereen/activitypub/handlers/AcceptFollowPersonHandler.java
index 807abf2b..0bf010bf 100644
--- a/src/main/java/smithereen/activitypub/handlers/AcceptFollowPersonHandler.java
+++ b/src/main/java/smithereen/activitypub/handlers/AcceptFollowPersonHandler.java
@@ -2,16 +2,15 @@
import java.sql.SQLException;
-import smithereen.activitypub.ActivityPubWorker;
-import smithereen.data.FriendshipStatus;
-import smithereen.data.feed.NewsfeedEntry;
-import smithereen.exceptions.ObjectNotFoundException;
import smithereen.activitypub.ActivityHandlerContext;
import smithereen.activitypub.NestedActivityTypeHandler;
import smithereen.activitypub.objects.activities.Accept;
import smithereen.activitypub.objects.activities.Follow;
import smithereen.data.ForeignUser;
+import smithereen.data.FriendshipStatus;
import smithereen.data.User;
+import smithereen.data.feed.NewsfeedEntry;
+import smithereen.exceptions.ObjectNotFoundException;
import smithereen.storage.NewsfeedStorage;
import smithereen.storage.UserStorage;
@@ -25,8 +24,12 @@ public void handle(ActivityHandlerContext context, ForeignUser actor, Accept act
UserStorage.setFollowAccepted(follower.id, actor.id, true);
FriendshipStatus status=UserStorage.getFriendshipStatus(follower.id, actor.id);
if(status==FriendshipStatus.FRIENDS){
- ActivityPubWorker.getInstance().sendAddToFriendsCollectionActivity(follower, actor);
+ context.appContext.getActivityPubWorker().sendAddToFriendsCollectionActivity(follower, actor);
NewsfeedStorage.putEntry(follower.id, actor.id, NewsfeedEntry.Type.ADD_FRIEND, null);
}
+ if(UserStorage.getLocalFollowersCount(actor.id)==1){
+ context.appContext.getActivityPubWorker().fetchActorRelationshipCollections(actor);
+ context.appContext.getActivityPubWorker().fetchActorContentCollections(actor);
+ }
}
}
diff --git a/src/main/java/smithereen/activitypub/handlers/AddGroupHandler.java b/src/main/java/smithereen/activitypub/handlers/AddGroupHandler.java
index 8e08d758..467be5ba 100644
--- a/src/main/java/smithereen/activitypub/handlers/AddGroupHandler.java
+++ b/src/main/java/smithereen/activitypub/handlers/AddGroupHandler.java
@@ -9,12 +9,14 @@
import smithereen.data.ForeignGroup;
import smithereen.data.ForeignUser;
import smithereen.data.Group;
+import smithereen.data.GroupMembership;
import smithereen.data.User;
import smithereen.data.feed.NewsfeedEntry;
import smithereen.exceptions.BadRequestException;
import smithereen.storage.GroupStorage;
import smithereen.storage.NewsfeedStorage;
import smithereen.storage.UserStorage;
+import smithereen.util.BackgroundTaskRunner;
public class AddGroupHandler extends ActivityTypeHandler{
@Override
@@ -22,14 +24,29 @@ public void handle(ActivityHandlerContext context, ForeignUser actor, Add activi
if(activity.target==null || activity.target.link==null)
throw new BadRequestException("activity.target is required and must be a URI");
URI target=activity.target.link;
- if(target.equals(actor.getFriendsURL())){
- if(object instanceof ForeignGroup && object.id==0)
- GroupStorage.putOrUpdateForeignGroup((ForeignGroup) object);
+ if(target.equals(actor.getGroupsURL())){
+ if(object instanceof ForeignGroup foreignGroup && object.id==0)
+ GroupStorage.putOrUpdateForeignGroup(foreignGroup);
- // TODO verify that this user is actually a member of this group and store the membership
- // https://socialhub.activitypub.rocks/t/querying-activitypub-collections/1866
+ if(object.accessType!=Group.AccessType.PRIVATE)
+ NewsfeedStorage.putEntry(actor.id, object.id, object.isEvent() ? NewsfeedEntry.Type.JOIN_EVENT : NewsfeedEntry.Type.JOIN_GROUP, null);
+
+ if(object instanceof ForeignGroup foreignGroup){
+ // Verify that the group in question does indeed have this user as its member
+ BackgroundTaskRunner.getInstance().submit(()->{
+ boolean tentative=foreignGroup.isEvent() && foreignGroup.tentativeMembers!=null && activity.tentative;
+ Group.MembershipState state=context.appContext.getGroupsController().getUserMembershipState(foreignGroup, actor);
+ if((state==Group.MembershipState.TENTATIVE_MEMBER && tentative) || (state==Group.MembershipState.MEMBER && !tentative))
+ return;
+ try{
+ context.appContext.getObjectLinkResolver().ensureObjectIsInCollection(object, tentative ? foreignGroup.tentativeMembers : foreignGroup.getMembersCollection(), actor.activityPubID);
+ context.appContext.getGroupsController().joinGroup(foreignGroup, actor, tentative, true);
+ }catch(Exception x){
+ LOG.warn("Error verifying that object {} belongs to collection {} or saving membership", object.activityPubID, target, x);
+ }
+ });
+ }
- NewsfeedStorage.putEntry(actor.id, object.id, NewsfeedEntry.Type.JOIN_GROUP, null);
}else{
LOG.warn("Unknown Add{Group} target {}", target);
}
diff --git a/src/main/java/smithereen/activitypub/handlers/AddNoteHandler.java b/src/main/java/smithereen/activitypub/handlers/AddNoteHandler.java
index 9db2bd6a..51e0b909 100644
--- a/src/main/java/smithereen/activitypub/handlers/AddNoteHandler.java
+++ b/src/main/java/smithereen/activitypub/handlers/AddNoteHandler.java
@@ -1,14 +1,15 @@
package smithereen.activitypub.handlers;
+import java.net.URI;
import java.sql.SQLException;
import java.util.Objects;
-import smithereen.ObjectLinkResolver;
-import smithereen.Utils;
import smithereen.activitypub.ActivityHandlerContext;
import smithereen.activitypub.ActivityTypeHandler;
+import smithereen.activitypub.objects.ActivityPubCollection;
import smithereen.activitypub.objects.Actor;
import smithereen.activitypub.objects.activities.Add;
+import smithereen.controllers.WallController;
import smithereen.data.Post;
import smithereen.data.notifications.NotificationUtils;
import smithereen.exceptions.BadRequestException;
@@ -16,15 +17,23 @@
public class AddNoteHandler extends ActivityTypeHandler{
@Override
public void handle(ActivityHandlerContext context, Actor actor, Add activity, Post post) throws SQLException{
- if(!Objects.equals(actor.getWallURL(), activity.target.link))
+ URI targetCollectionID;
+ if(activity.target.link!=null)
+ targetCollectionID=activity.target.link;
+ else if(activity.target.object instanceof ActivityPubCollection collection)
+ targetCollectionID=collection.activityPubID;
+ else
+ throw new BadRequestException("Add.target is required (either wall collection ID or abbreviated collection object)");
+
+ if(!Objects.equals(actor.getWallURL(), targetCollectionID))
throw new BadRequestException("Add.target doesn't match actor's wall collection");
if(!Objects.equals(post.owner.activityPubID, actor.activityPubID))
throw new BadRequestException("Post's target collection doesn't match actor's wall collection");
if(post.inReplyTo!=null)
throw new BadRequestException("Post can't be a reply");
- Utils.loadAndPreprocessRemotePostMentions(post);
- ObjectLinkResolver.storeOrUpdateRemoteObject(post);
+ context.appContext.getWallController().loadAndPreprocessRemotePostMentions(post);
+ context.appContext.getObjectLinkResolver().storeOrUpdateRemoteObject(post);
NotificationUtils.putNotificationsForPost(post, null);
}
}
diff --git a/src/main/java/smithereen/activitypub/handlers/AnnounceNoteHandler.java b/src/main/java/smithereen/activitypub/handlers/AnnounceNoteHandler.java
index 8c6488b3..5e1bd27e 100644
--- a/src/main/java/smithereen/activitypub/handlers/AnnounceNoteHandler.java
+++ b/src/main/java/smithereen/activitypub/handlers/AnnounceNoteHandler.java
@@ -3,36 +3,21 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import java.io.IOException;
-import java.net.URI;
import java.sql.SQLException;
import java.sql.Timestamp;
-import java.util.ArrayList;
import java.util.List;
-import java.util.concurrent.CompletableFuture;
-import smithereen.ObjectLinkResolver;
-import smithereen.activitypub.ActivityPubWorker;
-import smithereen.activitypub.objects.Activity;
-import smithereen.data.feed.NewsfeedEntry;
-import smithereen.exceptions.BadRequestException;
-import smithereen.Utils;
import smithereen.activitypub.ActivityHandlerContext;
-import smithereen.activitypub.ActivityPub;
import smithereen.activitypub.ActivityTypeHandler;
-import smithereen.activitypub.objects.ActivityPubObject;
-import smithereen.activitypub.objects.Mention;
import smithereen.activitypub.objects.activities.Announce;
+import smithereen.controllers.WallController;
import smithereen.data.ForeignUser;
import smithereen.data.Post;
-import smithereen.data.User;
+import smithereen.data.feed.NewsfeedEntry;
import smithereen.data.notifications.Notification;
-import smithereen.exceptions.ObjectNotFoundException;
import smithereen.storage.NewsfeedStorage;
import smithereen.storage.NotificationsStorage;
import smithereen.storage.PostStorage;
-import smithereen.storage.UserStorage;
-import spark.utils.StringUtils;
public class AnnounceNoteHandler extends ActivityTypeHandler{
private static final Logger LOG=LoggerFactory.getLogger(AnnounceNoteHandler.class);
@@ -44,19 +29,20 @@ public class AnnounceNoteHandler extends ActivityTypeHandler thread){
}
private void doHandle(Post post) throws SQLException{
- long time=activity.published==null ? System.currentTimeMillis() : activity.published.getTime();
+ long time=activity.published==null ? System.currentTimeMillis() : activity.published.toEpochMilli();
NewsfeedStorage.putEntry(actor.id, post.id, NewsfeedEntry.Type.RETOOT, new Timestamp(time));
if(!(post.user instanceof ForeignUser)){
diff --git a/src/main/java/smithereen/activitypub/handlers/CreateNoteHandler.java b/src/main/java/smithereen/activitypub/handlers/CreateNoteHandler.java
index 793e9407..cc6ff252 100644
--- a/src/main/java/smithereen/activitypub/handlers/CreateNoteHandler.java
+++ b/src/main/java/smithereen/activitypub/handlers/CreateNoteHandler.java
@@ -1,35 +1,37 @@
package smithereen.activitypub.handlers;
+import com.google.gson.JsonObject;
+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import java.io.IOException;
import java.net.URI;
import java.sql.SQLException;
-import java.util.ArrayList;
+import java.time.Instant;
+import java.time.temporal.ChronoUnit;
import java.util.Objects;
+import java.util.concurrent.TimeUnit;
import smithereen.Config;
-import smithereen.ObjectLinkResolver;
-import smithereen.activitypub.objects.ForeignActor;
-import smithereen.data.Group;
-import smithereen.data.PollOption;
-import smithereen.exceptions.BadRequestException;
import smithereen.Utils;
import smithereen.activitypub.ActivityHandlerContext;
import smithereen.activitypub.ActivityPub;
-import smithereen.activitypub.ActivityPubWorker;
import smithereen.activitypub.ActivityTypeHandler;
import smithereen.activitypub.objects.ActivityPubObject;
+import smithereen.activitypub.objects.ForeignActor;
import smithereen.activitypub.objects.LinkOrObject;
import smithereen.activitypub.objects.Mention;
import smithereen.activitypub.objects.activities.Create;
+import smithereen.controllers.WallController;
import smithereen.data.ForeignUser;
+import smithereen.data.Group;
+import smithereen.data.PollOption;
import smithereen.data.Post;
import smithereen.data.User;
import smithereen.data.notifications.NotificationUtils;
+import smithereen.exceptions.BadRequestException;
import smithereen.storage.PostStorage;
-import smithereen.storage.UserStorage;
+import smithereen.util.BackgroundTaskRunner;
import spark.utils.StringUtils;
public class CreateNoteHandler extends ActivityTypeHandler{
@@ -43,7 +45,7 @@ public void handle(ActivityHandlerContext context, ForeignUser actor, Create act
// Already exists. Ignore and return 200 OK.
return;
}
- post.resolveDependencies(true, false);
+ post.resolveDependencies(context.appContext, true, false);
if(post.user==null || post.user.id!=actor.id)
throw new BadRequestException("Can only create posts for self");
if(post.owner==null)
@@ -58,7 +60,7 @@ public void handle(ActivityHandlerContext context, ForeignUser actor, Create act
// Special handling for poll votes because using a separate activity type would've been too easy.
if((post.attachment==null || post.attachment.isEmpty()) && StringUtils.isEmpty(post.content) && post.inReplyTo!=null && post.name!=null){
- Post parent=ObjectLinkResolver.resolve(post.inReplyTo, Post.class, false, false, false);
+ Post parent=context.appContext.getObjectLinkResolver().resolve(post.inReplyTo, Post.class, false, false, false, (JsonObject) null, true);
if(parent.poll!=null){
int optionID=0;
if(post.context!=null){
@@ -77,8 +79,10 @@ public void handle(ActivityHandlerContext context, ForeignUser actor, Create act
}
}
if(optionID!=0){
- if(!parent.poll.isExpired())
+ if(!parent.poll.isExpired()){
PostStorage.voteInPoll(actor.id, parent.poll.id, optionID, post.activityPubID, parent.poll.multipleChoice);
+ context.appContext.getWallController().sendUpdateQuestionIfNeeded(parent);
+ }
return;
}
}
@@ -142,14 +146,14 @@ public void handle(ActivityHandlerContext context, ForeignUser actor, Create act
return;
}
}
- Utils.loadAndPreprocessRemotePostMentions(post);
+ context.appContext.getWallController().loadAndPreprocessRemotePostMentions(post);
if(post.inReplyTo!=null){
if(post.inReplyTo.equals(post.activityPubID))
throw new BadRequestException("Post can't be a reply to itself. This makes no sense.");
Post parent=PostStorage.getPostByID(post.inReplyTo);
if(parent!=null){
post.setParent(parent);
- ObjectLinkResolver.storeOrUpdateRemoteObject(post);
+ context.appContext.getObjectLinkResolver().storeOrUpdateRemoteObject(post);
NotificationUtils.putNotificationsForPost(post, parent);
Post topLevel=PostStorage.getPostByID(post.replyKey[0], false);
if(topLevel!=null && topLevel.local){
@@ -171,13 +175,13 @@ public void handle(ActivityHandlerContext context, ForeignUser actor, Create act
LOG.warn("Dropping post {} because its parent isn't known and it doesn't mention local users.", post.activityPubID);
return;
}
- ActivityPubWorker.getInstance().fetchReplyThread(post);
+ context.appContext.getActivityPubWorker().fetchReplyThread(post);
}
}else{
- ObjectLinkResolver.storeOrUpdateRemoteObject(post);
+ context.appContext.getObjectLinkResolver().storeOrUpdateRemoteObject(post);
NotificationUtils.putNotificationsForPost(post, null);
if(!Objects.equals(post.owner.activityPubID, post.user.activityPubID)){
- ActivityPubWorker.getInstance().sendAddPostToWallActivity(post);
+ context.appContext.getActivityPubWorker().sendAddPostToWallActivity(post);
}
}
}
diff --git a/src/main/java/smithereen/activitypub/handlers/FollowGroupHandler.java b/src/main/java/smithereen/activitypub/handlers/FollowGroupHandler.java
index fd57e24a..ba988f79 100644
--- a/src/main/java/smithereen/activitypub/handlers/FollowGroupHandler.java
+++ b/src/main/java/smithereen/activitypub/handlers/FollowGroupHandler.java
@@ -3,14 +3,15 @@
import java.sql.SQLException;
import smithereen.Utils;
-import smithereen.exceptions.BadRequestException;
import smithereen.activitypub.ActivityHandlerContext;
-import smithereen.activitypub.ActivityPubWorker;
import smithereen.activitypub.ActivityTypeHandler;
import smithereen.activitypub.objects.activities.Follow;
+import smithereen.activitypub.objects.activities.Join;
import smithereen.data.ForeignGroup;
import smithereen.data.ForeignUser;
import smithereen.data.Group;
+import smithereen.exceptions.BadRequestException;
+import smithereen.exceptions.UserActionNotAllowedException;
import smithereen.storage.GroupStorage;
public class FollowGroupHandler extends ActivityTypeHandler{
@@ -20,14 +21,28 @@ public void handle(ActivityHandlerContext context, ForeignUser actor, Follow act
throw new BadRequestException("Follow is only supported for local groups");
Utils.ensureUserNotBlocked(actor, group);
+ boolean tentative=group.isEvent() && activity instanceof Join j && j.tentative;
+
Group.MembershipState state=GroupStorage.getUserMembershipState(group.id, actor.id);
if(state==Group.MembershipState.MEMBER || state==Group.MembershipState.TENTATIVE_MEMBER){
// send an Accept{Follow} once again because the other server apparently didn't get it the first time
// why would it resend a Follow otherwise?
- ActivityPubWorker.getInstance().sendAcceptFollowActivity(actor, group, activity);
+ context.appContext.getActivityPubWorker().sendAcceptFollowActivity(actor, group, activity);
+ // update the event decision locally if it changed
+ if((tentative && state==Group.MembershipState.MEMBER) || (!tentative && state==Group.MembershipState.TENTATIVE_MEMBER))
+ GroupStorage.updateUserEventDecision(group, actor.id, tentative);
return;
}
- GroupStorage.joinGroup(group, actor.id, false, true);
- ActivityPubWorker.getInstance().sendAcceptFollowActivity(actor, group, activity);
+
+ boolean accept=true;
+ if(group.accessType==Group.AccessType.CLOSED){
+ accept=state==Group.MembershipState.INVITED;
+ }else if(group.accessType==Group.AccessType.PRIVATE && state!=Group.MembershipState.INVITED){
+ throw new UserActionNotAllowedException("Can't join a private group without an invitation");
+ }
+
+ GroupStorage.joinGroup(group, actor.id, tentative, accept);
+ if(accept)
+ context.appContext.getActivityPubWorker().sendAcceptFollowActivity(actor, group, activity);
}
}
diff --git a/src/main/java/smithereen/activitypub/handlers/FollowPersonHandler.java b/src/main/java/smithereen/activitypub/handlers/FollowPersonHandler.java
index f35e0029..a969d2b6 100644
--- a/src/main/java/smithereen/activitypub/handlers/FollowPersonHandler.java
+++ b/src/main/java/smithereen/activitypub/handlers/FollowPersonHandler.java
@@ -3,16 +3,15 @@
import java.sql.SQLException;
import smithereen.Utils;
-import smithereen.data.feed.NewsfeedEntry;
-import smithereen.exceptions.BadRequestException;
import smithereen.activitypub.ActivityHandlerContext;
-import smithereen.activitypub.ActivityPubWorker;
import smithereen.activitypub.ActivityTypeHandler;
import smithereen.activitypub.objects.activities.Follow;
import smithereen.data.ForeignUser;
import smithereen.data.FriendshipStatus;
import smithereen.data.User;
+import smithereen.data.feed.NewsfeedEntry;
import smithereen.data.notifications.Notification;
+import smithereen.exceptions.BadRequestException;
import smithereen.storage.NewsfeedStorage;
import smithereen.storage.NotificationsStorage;
import smithereen.storage.UserStorage;
@@ -27,10 +26,10 @@ public void handle(ActivityHandlerContext context, ForeignUser actor, Follow act
if(status==FriendshipStatus.FRIENDS || status==FriendshipStatus.REQUEST_SENT || status==FriendshipStatus.FOLLOWING){
throw new BadRequestException("Already following");
}
- UserStorage.followUser(actor.id, user.id, true);
+ UserStorage.followUser(actor.id, user.id, true, false);
UserStorage.deleteFriendRequest(actor.id, user.id);
- ActivityPubWorker.getInstance().sendAcceptFollowActivity(actor, user, activity);
+ context.appContext.getActivityPubWorker().sendAcceptFollowActivity(actor, user, activity);
Notification n=new Notification();
n.type=status==FriendshipStatus.REQUEST_RECVD ? Notification.Type.FRIEND_REQ_ACCEPT : Notification.Type.FOLLOW;
@@ -38,7 +37,7 @@ public void handle(ActivityHandlerContext context, ForeignUser actor, Follow act
NotificationsStorage.putNotification(user.id, n);
if(status==FriendshipStatus.REQUEST_RECVD || status==FriendshipStatus.FOLLOWED_BY){
- ActivityPubWorker.getInstance().sendAddToFriendsCollectionActivity(user, actor);
+ context.appContext.getActivityPubWorker().sendAddToFriendsCollectionActivity(user, actor);
NewsfeedStorage.putEntry(user.id, actor.id, NewsfeedEntry.Type.ADD_FRIEND, null);
}
}
diff --git a/src/main/java/smithereen/activitypub/handlers/GroupAddPersonHandler.java b/src/main/java/smithereen/activitypub/handlers/GroupAddPersonHandler.java
new file mode 100644
index 00000000..de7c290f
--- /dev/null
+++ b/src/main/java/smithereen/activitypub/handlers/GroupAddPersonHandler.java
@@ -0,0 +1,44 @@
+package smithereen.activitypub.handlers;
+
+import java.net.URI;
+import java.sql.SQLException;
+
+import smithereen.activitypub.ActivityHandlerContext;
+import smithereen.activitypub.ActivityTypeHandler;
+import smithereen.activitypub.objects.activities.Add;
+import smithereen.data.ForeignGroup;
+import smithereen.data.ForeignUser;
+import smithereen.data.User;
+import smithereen.data.feed.NewsfeedEntry;
+import smithereen.exceptions.BadRequestException;
+import smithereen.storage.NewsfeedStorage;
+import smithereen.storage.UserStorage;
+import smithereen.util.BackgroundTaskRunner;
+
+public class GroupAddPersonHandler extends ActivityTypeHandler{
+ @Override
+ public void handle(ActivityHandlerContext context, ForeignGroup actor, Add activity, User object) throws SQLException{
+ if(activity.target==null || activity.target.link==null)
+ throw new BadRequestException("activity.target is required and must be a URI");
+ URI target=activity.target.link;
+ if(target.equals(actor.getMembersCollection()) || target.equals(actor.tentativeMembers)){
+ if(object instanceof ForeignUser && object.id==0)
+ UserStorage.putOrUpdateForeignUser((ForeignUser) object);
+
+ NewsfeedStorage.putEntry(actor.id, object.id, NewsfeedEntry.Type.ADD_FRIEND, null);
+
+ if(object instanceof ForeignUser foreignUser && foreignUser.getGroupsURL()!=null){
+ BackgroundTaskRunner.getInstance().submit(()->{
+ try{
+ context.appContext.getObjectLinkResolver().ensureObjectIsInCollection(foreignUser, foreignUser.getGroupsURL(), actor.activityPubID);
+ context.appContext.getGroupsController().joinGroup(actor, object, target.equals(actor.tentativeMembers), true);
+ }catch(Exception x){
+ LOG.warn("Error verifying that {} is a member of {} or storing that relationship", actor.activityPubID, object.activityPubID);
+ }
+ });
+ }
+ }else{
+ LOG.warn("Unknown Add{Person} target {}", target);
+ }
+ }
+}
diff --git a/src/main/java/smithereen/activitypub/handlers/GroupBlockPersonHandler.java b/src/main/java/smithereen/activitypub/handlers/GroupBlockPersonHandler.java
index f2520fa1..b4043554 100644
--- a/src/main/java/smithereen/activitypub/handlers/GroupBlockPersonHandler.java
+++ b/src/main/java/smithereen/activitypub/handlers/GroupBlockPersonHandler.java
@@ -3,14 +3,11 @@
import java.sql.SQLException;
import smithereen.activitypub.ActivityHandlerContext;
-import smithereen.activitypub.ActivityPubWorker;
import smithereen.activitypub.ActivityTypeHandler;
import smithereen.activitypub.objects.activities.Block;
import smithereen.data.ForeignGroup;
-import smithereen.data.ForeignUser;
import smithereen.data.User;
import smithereen.storage.GroupStorage;
-import smithereen.storage.UserStorage;
public class GroupBlockPersonHandler extends ActivityTypeHandler{
@@ -18,6 +15,6 @@ public class GroupBlockPersonHandler extends ActivityTypeHandler{
+ @Override
+ public void handle(ActivityHandlerContext context, ForeignGroup actor, Remove activity, User object) throws SQLException{
+ if(activity.target==null || activity.target.link==null)
+ throw new BadRequestException("activity.target is required and must be a URI");
+ URI target=activity.target.link;
+ if(target.equals(actor.getMembersCollection()) || target.equals(actor.tentativeMembers)){
+ if(object instanceof ForeignUser && object.id==0)
+ return;
+
+ GroupStorage.leaveGroup(actor, object.id, target.equals(actor.tentativeMembers), true);
+ }else{
+ LOG.warn("Unknown Remove{Person} target {}", target);
+ }
+ }
+}
diff --git a/src/main/java/smithereen/activitypub/handlers/InviteGroupHandler.java b/src/main/java/smithereen/activitypub/handlers/InviteGroupHandler.java
new file mode 100644
index 00000000..44e79133
--- /dev/null
+++ b/src/main/java/smithereen/activitypub/handlers/InviteGroupHandler.java
@@ -0,0 +1,56 @@
+package smithereen.activitypub.handlers;
+
+import java.sql.SQLException;
+import java.util.Objects;
+
+import smithereen.Utils;
+import smithereen.activitypub.ActivityHandlerContext;
+import smithereen.activitypub.ActivityTypeHandler;
+import smithereen.activitypub.objects.activities.Invite;
+import smithereen.data.ForeignGroup;
+import smithereen.data.ForeignUser;
+import smithereen.data.Group;
+import smithereen.data.User;
+import smithereen.data.UserNotifications;
+import smithereen.exceptions.BadRequestException;
+import smithereen.exceptions.InternalServerErrorException;
+import smithereen.storage.GroupStorage;
+import smithereen.storage.NotificationsStorage;
+
+public class InviteGroupHandler extends ActivityTypeHandler{
+ @Override
+ public void handle(ActivityHandlerContext context, ForeignUser actor, Invite invite, Group object) throws SQLException{
+ Utils.ensureUserNotBlocked(actor, object);
+ if(!(object instanceof ForeignGroup)){
+ Group.MembershipState inviterState=context.appContext.getGroupsController().getUserMembershipState(object, actor);
+ if(inviterState!=Group.MembershipState.MEMBER && inviterState!=Group.MembershipState.TENTATIVE_MEMBER)
+ throw new BadRequestException("Inviter must be a member of this group");
+ }
+ if(invite.to==null || invite.to.size()!=1 || invite.to.get(0).link==null)
+ throw new BadRequestException("Invite.to must have exactly 1 element and it must be a user ID");
+ User user=context.appContext.getObjectLinkResolver().resolve(invite.to.get(0).link, User.class, true, true, false);
+ Utils.ensureUserNotBlocked(actor, user);
+ if(object.id==0)
+ context.appContext.getObjectLinkResolver().storeOrUpdateRemoteObject(object);
+ context.appContext.getGroupsController().runLocked(()->{
+ Group.MembershipState state=context.appContext.getGroupsController().getUserMembershipState(object, user);
+ if(state!=Group.MembershipState.NONE)
+ throw new BadRequestException("Can only invite users who aren't members of this group and don't have a pending invitation to it");
+ try{
+ GroupStorage.putInvitation(object.id, actor.id, user.id, object.isEvent(), Objects.toString(invite.activityPubID, null));
+ }catch(SQLException x){
+ throw new InternalServerErrorException(x);
+ }
+ });
+
+ if(!(user instanceof ForeignUser)){
+ UserNotifications notifications=NotificationsStorage.getNotificationsFromCache(user.id);
+ if(notifications!=null){
+ if(object.isEvent())
+ notifications.incNewEventInvitationsCount(1);
+ else
+ notifications.incNewGroupInvitationsCount(1);
+ }
+ }
+ }
+}
diff --git a/src/main/java/smithereen/activitypub/handlers/LeaveGroupHandler.java b/src/main/java/smithereen/activitypub/handlers/LeaveGroupHandler.java
index 6c0d06ef..386cde2c 100644
--- a/src/main/java/smithereen/activitypub/handlers/LeaveGroupHandler.java
+++ b/src/main/java/smithereen/activitypub/handlers/LeaveGroupHandler.java
@@ -2,11 +2,9 @@
import java.sql.SQLException;
-import smithereen.exceptions.BadRequestException;
import smithereen.activitypub.ActivityHandlerContext;
import smithereen.activitypub.ActivityTypeHandler;
import smithereen.activitypub.objects.activities.Leave;
-import smithereen.data.ForeignGroup;
import smithereen.data.ForeignUser;
import smithereen.data.Group;
import smithereen.storage.GroupStorage;
@@ -14,12 +12,12 @@
public class LeaveGroupHandler extends ActivityTypeHandler{
@Override
public void handle(ActivityHandlerContext context, ForeignUser actor, Leave activity, Group group) throws SQLException{
- if(group instanceof ForeignGroup)
- throw new BadRequestException("Local group required here");
+ group.ensureLocal();
Group.MembershipState state=GroupStorage.getUserMembershipState(group.id, actor.id);
- if(state!=Group.MembershipState.MEMBER && state!=Group.MembershipState.TENTATIVE_MEMBER){
+ if(state!=Group.MembershipState.MEMBER && state!=Group.MembershipState.TENTATIVE_MEMBER && state!=Group.MembershipState.REQUESTED){
return;
}
- GroupStorage.leaveGroup(group, actor.id, state==Group.MembershipState.TENTATIVE_MEMBER);
+ GroupStorage.leaveGroup(group, actor.id, state==Group.MembershipState.TENTATIVE_MEMBER, state!=Group.MembershipState.REQUESTED);
+ context.appContext.getActivityPubWorker().sendRemoveUserFromGroupActivity(actor, group, state==Group.MembershipState.TENTATIVE_MEMBER);
}
}
diff --git a/src/main/java/smithereen/activitypub/handlers/AddPersonHandler.java b/src/main/java/smithereen/activitypub/handlers/PersonAddPersonHandler.java
similarity index 59%
rename from src/main/java/smithereen/activitypub/handlers/AddPersonHandler.java
rename to src/main/java/smithereen/activitypub/handlers/PersonAddPersonHandler.java
index d9e66d02..dd797b50 100644
--- a/src/main/java/smithereen/activitypub/handlers/AddPersonHandler.java
+++ b/src/main/java/smithereen/activitypub/handlers/PersonAddPersonHandler.java
@@ -12,8 +12,9 @@
import smithereen.exceptions.BadRequestException;
import smithereen.storage.NewsfeedStorage;
import smithereen.storage.UserStorage;
+import smithereen.util.BackgroundTaskRunner;
-public class AddPersonHandler extends ActivityTypeHandler{
+public class PersonAddPersonHandler extends ActivityTypeHandler{
@Override
public void handle(ActivityHandlerContext context, ForeignUser actor, Add activity, User object) throws SQLException{
if(activity.target==null || activity.target.link==null)
@@ -23,10 +24,19 @@ public void handle(ActivityHandlerContext context, ForeignUser actor, Add activi
if(object instanceof ForeignUser && object.id==0)
UserStorage.putOrUpdateForeignUser((ForeignUser) object);
- // TODO verify that friends collections of both users contain each other and store a mutual follow
- // https://socialhub.activitypub.rocks/t/querying-activitypub-collections/1866
-
NewsfeedStorage.putEntry(actor.id, object.id, NewsfeedEntry.Type.ADD_FRIEND, null);
+
+ if(object instanceof ForeignUser foreignUser && foreignUser.getFriendsURL()!=null){
+ // Verify that the target user does indeed have the actor as their friend
+ BackgroundTaskRunner.getInstance().submit(()->{
+ try{
+ context.appContext.getObjectLinkResolver().ensureObjectIsInCollection(foreignUser, foreignUser.getFriendsURL(), actor.activityPubID);
+ context.appContext.getFriendsController().storeFriendship(actor, object);
+ }catch(Exception x){
+ LOG.warn("Error verifying that {} is a friend of {} or storing that relationship", actor.activityPubID, object.activityPubID);
+ }
+ });
+ }
}else{
LOG.warn("Unknown Add{Person} target {}", target);
}
diff --git a/src/main/java/smithereen/activitypub/handlers/PersonBlockPersonHandler.java b/src/main/java/smithereen/activitypub/handlers/PersonBlockPersonHandler.java
index 5930a272..ffb4fd87 100644
--- a/src/main/java/smithereen/activitypub/handlers/PersonBlockPersonHandler.java
+++ b/src/main/java/smithereen/activitypub/handlers/PersonBlockPersonHandler.java
@@ -3,7 +3,6 @@
import java.sql.SQLException;
import smithereen.activitypub.ActivityHandlerContext;
-import smithereen.activitypub.ActivityPubWorker;
import smithereen.activitypub.ActivityTypeHandler;
import smithereen.activitypub.objects.activities.Block;
import smithereen.data.ForeignUser;
@@ -20,7 +19,7 @@ public void handle(ActivityHandlerContext context, ForeignUser actor, Block acti
FriendshipStatus status=UserStorage.getFriendshipStatus(object.id, actor.id);
UserStorage.blockUser(actor.id, object.id);
if(status==FriendshipStatus.FRIENDS){
- ActivityPubWorker.getInstance().sendRemoveFromFriendsCollectionActivity(object, actor);
+ context.appContext.getActivityPubWorker().sendRemoveFromFriendsCollectionActivity(object, actor);
NewsfeedStorage.deleteEntry(object.id, actor.id, NewsfeedEntry.Type.ADD_FRIEND);
}
}
diff --git a/src/main/java/smithereen/activitypub/handlers/RemovePersonHandler.java b/src/main/java/smithereen/activitypub/handlers/PersonRemovePersonHandler.java
similarity index 88%
rename from src/main/java/smithereen/activitypub/handlers/RemovePersonHandler.java
rename to src/main/java/smithereen/activitypub/handlers/PersonRemovePersonHandler.java
index 26419d45..ec1d4f23 100644
--- a/src/main/java/smithereen/activitypub/handlers/RemovePersonHandler.java
+++ b/src/main/java/smithereen/activitypub/handlers/PersonRemovePersonHandler.java
@@ -5,7 +5,6 @@
import smithereen.activitypub.ActivityHandlerContext;
import smithereen.activitypub.ActivityTypeHandler;
-import smithereen.activitypub.objects.activities.Add;
import smithereen.activitypub.objects.activities.Remove;
import smithereen.data.ForeignUser;
import smithereen.data.User;
@@ -14,7 +13,7 @@
import smithereen.storage.NewsfeedStorage;
import smithereen.storage.UserStorage;
-public class RemovePersonHandler extends ActivityTypeHandler{
+public class PersonRemovePersonHandler extends ActivityTypeHandler{
@Override
public void handle(ActivityHandlerContext context, ForeignUser actor, Remove activity, User object) throws SQLException{
if(activity.target==null || activity.target.link==null)
@@ -25,6 +24,7 @@ public void handle(ActivityHandlerContext context, ForeignUser actor, Remove act
return;
NewsfeedStorage.deleteEntry(actor.id, object.id, NewsfeedEntry.Type.ADD_FRIEND);
+ UserStorage.unfriendUser(actor.id, object.id);
}else{
LOG.warn("Unknown Remove{Person} target {}", target);
}
diff --git a/src/main/java/smithereen/activitypub/handlers/RejectFollowGroupHandler.java b/src/main/java/smithereen/activitypub/handlers/RejectFollowGroupHandler.java
index f40791fe..38f57ec0 100644
--- a/src/main/java/smithereen/activitypub/handlers/RejectFollowGroupHandler.java
+++ b/src/main/java/smithereen/activitypub/handlers/RejectFollowGroupHandler.java
@@ -3,12 +3,10 @@
import java.sql.SQLException;
import smithereen.activitypub.ActivityHandlerContext;
-import smithereen.activitypub.ActivityPubWorker;
import smithereen.activitypub.NestedActivityTypeHandler;
import smithereen.activitypub.objects.activities.Follow;
import smithereen.activitypub.objects.activities.Reject;
import smithereen.data.ForeignGroup;
-import smithereen.data.ForeignUser;
import smithereen.data.Group;
import smithereen.data.User;
import smithereen.exceptions.ObjectNotFoundException;
@@ -23,9 +21,9 @@ public void handle(ActivityHandlerContext context, ForeignGroup actor, Reject ac
throw new ObjectNotFoundException("Follower not found");
follower.ensureLocal();
Group.MembershipState state=GroupStorage.getUserMembershipState(actor.id, follower.id);
- GroupStorage.leaveGroup(actor, follower.id, false);
+ GroupStorage.leaveGroup(actor, follower.id, false, state!=Group.MembershipState.REQUESTED);
if(state==Group.MembershipState.MEMBER || state==Group.MembershipState.TENTATIVE_MEMBER){
- ActivityPubWorker.getInstance().sendRemoveFromGroupsCollectionActivity(follower, actor);
+ context.appContext.getActivityPubWorker().sendRemoveFromGroupsCollectionActivity(follower, actor);
}
}
}
diff --git a/src/main/java/smithereen/activitypub/handlers/RejectInviteGroupHandler.java b/src/main/java/smithereen/activitypub/handlers/RejectInviteGroupHandler.java
new file mode 100644
index 00000000..6805a008
--- /dev/null
+++ b/src/main/java/smithereen/activitypub/handlers/RejectInviteGroupHandler.java
@@ -0,0 +1,25 @@
+package smithereen.activitypub.handlers;
+
+import java.sql.SQLException;
+
+import smithereen.activitypub.ActivityHandlerContext;
+import smithereen.activitypub.NestedActivityTypeHandler;
+import smithereen.activitypub.objects.activities.Invite;
+import smithereen.activitypub.objects.activities.Reject;
+import smithereen.data.ForeignUser;
+import smithereen.data.Group;
+import smithereen.data.User;
+import smithereen.exceptions.BadRequestException;
+import smithereen.storage.GroupStorage;
+
+public class RejectInviteGroupHandler extends NestedActivityTypeHandler{
+ @Override
+ public void handle(ActivityHandlerContext context, ForeignUser actor, Reject activity, Invite invite, Group group) throws SQLException{
+ group.ensureLocal();
+ if(invite.to==null || invite.to.size()!=1 || invite.to.get(0).link==null)
+ throw new BadRequestException("Invite.to must have exactly 1 element and it must be a user ID");
+ if(!actor.activityPubID.equals(invite.to.get(0).link))
+ throw new BadRequestException("Reject.actor must match Invite.to[0]");
+ GroupStorage.deleteInvitation(actor.id, group.id, group.isEvent());
+ }
+}
diff --git a/src/main/java/smithereen/activitypub/handlers/RemoveGroupHandler.java b/src/main/java/smithereen/activitypub/handlers/RemoveGroupHandler.java
index f447fd2f..d2f0f5ec 100644
--- a/src/main/java/smithereen/activitypub/handlers/RemoveGroupHandler.java
+++ b/src/main/java/smithereen/activitypub/handlers/RemoveGroupHandler.java
@@ -19,8 +19,8 @@ public void handle(ActivityHandlerContext context, ForeignUser actor, Remove act
if(activity.target==null || activity.target.link==null)
throw new BadRequestException("activity.target is required and must be a URI");
URI target=activity.target.link;
- if(target.equals(actor.getFriendsURL())){
- NewsfeedStorage.deleteEntry(actor.id, object.id, NewsfeedEntry.Type.JOIN_GROUP);
+ if(target.equals(actor.getGroupsURL())){
+ context.appContext.getGroupsController().leaveGroup(object, actor);
}else{
LOG.warn("Unknown Remove{Group} target {}", target);
}
diff --git a/src/main/java/smithereen/activitypub/handlers/UndoAcceptFollowGroupHandler.java b/src/main/java/smithereen/activitypub/handlers/UndoAcceptFollowGroupHandler.java
index 48542c57..b7574bf9 100644
--- a/src/main/java/smithereen/activitypub/handlers/UndoAcceptFollowGroupHandler.java
+++ b/src/main/java/smithereen/activitypub/handlers/UndoAcceptFollowGroupHandler.java
@@ -3,14 +3,11 @@
import java.sql.SQLException;
import smithereen.activitypub.ActivityHandlerContext;
-import smithereen.activitypub.ActivityPubWorker;
import smithereen.activitypub.DoublyNestedActivityTypeHandler;
import smithereen.activitypub.objects.activities.Accept;
import smithereen.activitypub.objects.activities.Follow;
import smithereen.activitypub.objects.activities.Undo;
import smithereen.data.ForeignGroup;
-import smithereen.data.ForeignUser;
-import smithereen.data.FriendshipStatus;
import smithereen.data.Group;
import smithereen.data.User;
import smithereen.exceptions.ObjectNotFoundException;
@@ -25,9 +22,9 @@ public void handle(ActivityHandlerContext context, ForeignGroup actor, Undo undo
throw new ObjectNotFoundException("Follower not found");
follower.ensureLocal();
Group.MembershipState state=GroupStorage.getUserMembershipState(actor.id, follower.id);
- GroupStorage.setMemberAccepted(actor.id, follower.id, false);
+ GroupStorage.setMemberAccepted(actor, follower.id, false);
if(state==Group.MembershipState.MEMBER || state==Group.MembershipState.TENTATIVE_MEMBER){
- ActivityPubWorker.getInstance().sendRemoveFromGroupsCollectionActivity(follower, actor);
+ context.appContext.getActivityPubWorker().sendRemoveFromGroupsCollectionActivity(follower, actor);
}
}
}
diff --git a/src/main/java/smithereen/activitypub/handlers/UndoAcceptFollowPersonHandler.java b/src/main/java/smithereen/activitypub/handlers/UndoAcceptFollowPersonHandler.java
index 3e646bde..7d043149 100644
--- a/src/main/java/smithereen/activitypub/handlers/UndoAcceptFollowPersonHandler.java
+++ b/src/main/java/smithereen/activitypub/handlers/UndoAcceptFollowPersonHandler.java
@@ -2,17 +2,16 @@
import java.sql.SQLException;
-import smithereen.activitypub.ActivityPubWorker;
-import smithereen.data.FriendshipStatus;
-import smithereen.data.feed.NewsfeedEntry;
-import smithereen.exceptions.ObjectNotFoundException;
import smithereen.activitypub.ActivityHandlerContext;
import smithereen.activitypub.DoublyNestedActivityTypeHandler;
import smithereen.activitypub.objects.activities.Accept;
import smithereen.activitypub.objects.activities.Follow;
import smithereen.activitypub.objects.activities.Undo;
import smithereen.data.ForeignUser;
+import smithereen.data.FriendshipStatus;
import smithereen.data.User;
+import smithereen.data.feed.NewsfeedEntry;
+import smithereen.exceptions.ObjectNotFoundException;
import smithereen.storage.NewsfeedStorage;
import smithereen.storage.UserStorage;
@@ -26,7 +25,7 @@ public void handle(ActivityHandlerContext context, ForeignUser actor, Undo undo,
FriendshipStatus status=UserStorage.getFriendshipStatus(follower.id, actor.id);
UserStorage.setFollowAccepted(follower.id, actor.id, false);
if(status==FriendshipStatus.FRIENDS){
- ActivityPubWorker.getInstance().sendRemoveFromFriendsCollectionActivity(follower, actor);
+ context.appContext.getActivityPubWorker().sendRemoveFromFriendsCollectionActivity(follower, actor);
NewsfeedStorage.deleteEntry(follower.id, actor.id, NewsfeedEntry.Type.ADD_FRIEND);
}
}
diff --git a/src/main/java/smithereen/activitypub/handlers/UndoFollowGroupHandler.java b/src/main/java/smithereen/activitypub/handlers/UndoFollowGroupHandler.java
index d82227a6..1486befb 100644
--- a/src/main/java/smithereen/activitypub/handlers/UndoFollowGroupHandler.java
+++ b/src/main/java/smithereen/activitypub/handlers/UndoFollowGroupHandler.java
@@ -2,7 +2,6 @@
import java.sql.SQLException;
-import smithereen.exceptions.BadRequestException;
import smithereen.activitypub.ActivityHandlerContext;
import smithereen.activitypub.NestedActivityTypeHandler;
import smithereen.activitypub.objects.activities.Follow;
@@ -10,6 +9,7 @@
import smithereen.data.ForeignGroup;
import smithereen.data.ForeignUser;
import smithereen.data.Group;
+import smithereen.exceptions.BadRequestException;
import smithereen.storage.GroupStorage;
public class UndoFollowGroupHandler extends NestedActivityTypeHandler{
@@ -18,9 +18,9 @@ public void handle(ActivityHandlerContext context, ForeignUser actor, Undo activ
if(group instanceof ForeignGroup)
throw new BadRequestException("Local group required here");
Group.MembershipState state=GroupStorage.getUserMembershipState(group.id, actor.id);
- if(state!=Group.MembershipState.MEMBER && state!=Group.MembershipState.TENTATIVE_MEMBER){
+ if(state!=Group.MembershipState.MEMBER && state!=Group.MembershipState.TENTATIVE_MEMBER && state!=Group.MembershipState.REQUESTED){
return;
}
- GroupStorage.leaveGroup(group, actor.id, state==Group.MembershipState.TENTATIVE_MEMBER);
+ GroupStorage.leaveGroup(group, actor.id, state==Group.MembershipState.TENTATIVE_MEMBER, state!=Group.MembershipState.REQUESTED);
}
}
diff --git a/src/main/java/smithereen/activitypub/handlers/UndoFollowPersonHandler.java b/src/main/java/smithereen/activitypub/handlers/UndoFollowPersonHandler.java
index d8651da0..f963c4c3 100644
--- a/src/main/java/smithereen/activitypub/handlers/UndoFollowPersonHandler.java
+++ b/src/main/java/smithereen/activitypub/handlers/UndoFollowPersonHandler.java
@@ -3,7 +3,6 @@
import java.sql.SQLException;
import smithereen.activitypub.ActivityHandlerContext;
-import smithereen.activitypub.ActivityPubWorker;
import smithereen.activitypub.NestedActivityTypeHandler;
import smithereen.activitypub.objects.activities.Follow;
import smithereen.activitypub.objects.activities.Undo;
@@ -21,7 +20,7 @@ public void handle(ActivityHandlerContext context, ForeignUser actor, Undo activ
FriendshipStatus status=UserStorage.getFriendshipStatus(actor.id, user.id);
UserStorage.unfriendUser(actor.id, user.id);
if(status==FriendshipStatus.FRIENDS){
- ActivityPubWorker.getInstance().sendRemoveFromFriendsCollectionActivity(user, actor);
+ context.appContext.getActivityPubWorker().sendRemoveFromFriendsCollectionActivity(user, actor);
NewsfeedStorage.deleteEntry(user.id, actor.id, NewsfeedEntry.Type.ADD_FRIEND);
}
}
diff --git a/src/main/java/smithereen/activitypub/handlers/UndoInviteGroupHandler.java b/src/main/java/smithereen/activitypub/handlers/UndoInviteGroupHandler.java
new file mode 100644
index 00000000..7de3beeb
--- /dev/null
+++ b/src/main/java/smithereen/activitypub/handlers/UndoInviteGroupHandler.java
@@ -0,0 +1,28 @@
+package smithereen.activitypub.handlers;
+
+import java.sql.SQLException;
+import java.util.Objects;
+
+import smithereen.activitypub.ActivityHandlerContext;
+import smithereen.activitypub.NestedActivityTypeHandler;
+import smithereen.activitypub.objects.activities.Invite;
+import smithereen.activitypub.objects.activities.Undo;
+import smithereen.data.ForeignGroup;
+import smithereen.data.User;
+import smithereen.exceptions.BadRequestException;
+import smithereen.storage.GroupStorage;
+
+public class UndoInviteGroupHandler extends NestedActivityTypeHandler{
+ @Override
+ public void handle(ActivityHandlerContext context, ForeignGroup group, Undo undo, Invite invite, ForeignGroup object) throws SQLException{
+ if(!Objects.equals(group.activityPubID, object.activityPubID))
+ throw new BadRequestException("Groups can only undo invites to themselves");
+
+ if(invite.to==null || invite.to.size()!=1 || invite.to.get(0).link==null)
+ throw new BadRequestException("Invite.to must have exactly 1 element and it must be a user ID");
+ User user=context.appContext.getObjectLinkResolver().resolve(invite.to.get(0).link, User.class, false, false, false);
+ user.ensureLocal();
+
+ GroupStorage.deleteInvitation(user.id, group.id, group.isEvent());
+ }
+}
diff --git a/src/main/java/smithereen/activitypub/handlers/UpdateNoteHandler.java b/src/main/java/smithereen/activitypub/handlers/UpdateNoteHandler.java
index 483c4542..36dc1c83 100644
--- a/src/main/java/smithereen/activitypub/handlers/UpdateNoteHandler.java
+++ b/src/main/java/smithereen/activitypub/handlers/UpdateNoteHandler.java
@@ -1,24 +1,16 @@
package smithereen.activitypub.handlers;
-import java.io.IOException;
-import java.net.URI;
import java.sql.SQLException;
-import java.util.ArrayList;
+import java.util.Objects;
-import smithereen.exceptions.ObjectNotFoundException;
-import smithereen.Utils;
import smithereen.activitypub.ActivityHandlerContext;
-import smithereen.activitypub.ActivityPub;
import smithereen.activitypub.ActivityTypeHandler;
-import smithereen.activitypub.objects.ActivityPubObject;
-import smithereen.activitypub.objects.Mention;
import smithereen.activitypub.objects.activities.Update;
+import smithereen.controllers.WallController;
import smithereen.data.ForeignUser;
import smithereen.data.Post;
-import smithereen.data.User;
+import smithereen.exceptions.ObjectNotFoundException;
import smithereen.storage.PostStorage;
-import smithereen.storage.UserStorage;
-import spark.utils.StringUtils;
public class UpdateNoteHandler extends ActivityTypeHandler{
@Override
@@ -31,10 +23,13 @@ public void handle(ActivityHandlerContext context, ForeignUser actor, Update act
if(post.user.id!=existing.user.id){
throw new IllegalArgumentException("Post author doesn't match existing");
}
- if(!post.owner.activityPubID.equals(existing.owner.activityPubID)){
+ if(post.inReplyTo==null && !post.owner.activityPubID.equals(existing.owner.activityPubID)){
throw new IllegalArgumentException("Post owner doesn't match existing");
}
- Utils.loadAndPreprocessRemotePostMentions(post);
+ if(!Objects.equals(post.inReplyTo, existing.inReplyTo)){
+ throw new IllegalArgumentException("inReplyTo doesn't match existing");
+ }
+ context.appContext.getWallController().loadAndPreprocessRemotePostMentions(post);
PostStorage.putForeignWallPost(post);
}else{
throw new IllegalArgumentException("No access to update this post");
diff --git a/src/main/java/smithereen/activitypub/objects/ActivityPubObject.java b/src/main/java/smithereen/activitypub/objects/ActivityPubObject.java
index 808a8535..5264d7c0 100644
--- a/src/main/java/smithereen/activitypub/objects/ActivityPubObject.java
+++ b/src/main/java/smithereen/activitypub/objects/ActivityPubObject.java
@@ -11,6 +11,7 @@
import java.net.URI;
import java.net.URISyntaxException;
import java.sql.SQLException;
+import java.time.Instant;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Date;
@@ -20,6 +21,7 @@
import java.util.regex.Matcher;
import java.util.regex.Pattern;
+import smithereen.ApplicationContext;
import smithereen.Utils;
import smithereen.activitypub.ContextCollector;
import smithereen.activitypub.ParserContext;
@@ -30,10 +32,12 @@
import smithereen.activitypub.objects.activities.Create;
import smithereen.activitypub.objects.activities.Delete;
import smithereen.activitypub.objects.activities.Follow;
+import smithereen.activitypub.objects.activities.Invite;
import smithereen.activitypub.objects.activities.Join;
import smithereen.activitypub.objects.activities.Like;
import smithereen.activitypub.objects.activities.Offer;
import smithereen.activitypub.objects.activities.Reject;
+import smithereen.activitypub.objects.activities.Remove;
import smithereen.activitypub.objects.activities.Undo;
import smithereen.activitypub.objects.activities.Update;
import smithereen.data.ForeignGroup;
@@ -54,19 +58,19 @@ public abstract class ActivityPubObject{
public String content;
public URI context;
public String name;
- public Date endTime;
+ public Instant endTime;
public LinkOrObject generator;
public List image;
public List icon;
public URI inReplyTo;
public LinkOrObject location;
public LinkOrObject preview;
- public Date published;
+ public Instant published;
public LinkOrObject replies;
- public Date startTime;
+ public Instant startTime;
public String summary;
public List tag;
- public Date updated;
+ public Instant updated;
public URI url;
public List to;
public List bto;
@@ -128,7 +132,7 @@ public JsonObject asActivityPubObject(JsonObject obj, ContextCollector contextCo
if(summary!=null)
obj.addProperty("summary", summary);
if(tag!=null && !tag.isEmpty())
- obj.add("tag", serializeObjectArrayCompact(tag, contextCollector));
+ obj.add("tag", serializeObjectArray(tag, contextCollector));
if(updated!=null)
obj.addProperty("updated", Utils.formatDateAsISO(updated));
if(url!=null)
@@ -204,7 +208,7 @@ protected URI tryParseURL(String url){
}
}
- protected Date tryParseDate(String date){
+ protected Instant tryParseDate(String date){
if(date==null)
return null;
return Utils.parseISODate(date);
@@ -381,11 +385,11 @@ protected ActivityPubObject parseActivityPubObject(JsonObject obj, ParserContext
//abstract String getType();
- public void resolveDependencies(boolean allowFetching, boolean allowStorage) throws SQLException{
+ public void resolveDependencies(ApplicationContext context, boolean allowFetching, boolean allowStorage){
}
- public void storeDependencies() throws SQLException{
+ public void storeDependencies(ApplicationContext context){
}
@@ -538,7 +542,7 @@ public static ActivityPubObject parse(JsonObject obj, ParserContext parserContex
ActivityPubObject res=switch(type){
// Actors
case "Person" -> new ForeignUser();
- case "Service" -> obj.has("id") ? new ForeignUser() : new Service();
+ case "Service", "Application" -> obj.has("id") ? new ForeignUser() : new Service();
case "Group", "Organization" -> new ForeignGroup();
// Objects
@@ -550,12 +554,14 @@ public static ActivityPubObject parse(JsonObject obj, ParserContext parserContex
case "Mention" -> new Mention();
case "Relationship" -> new Relationship();
case "PropertyValue" -> new PropertyValue();
+ case "Event" -> new Event();
// Collections
case "Collection" -> new ActivityPubCollection(false);
case "OrderedCollection" -> new ActivityPubCollection(true);
case "CollectionPage" -> new CollectionPage(false);
case "OrderedCollectionPage" -> new CollectionPage(true);
+ case "CollectionQueryResult" -> new CollectionQueryResult();
// Activities
case "Accept" -> new Accept();
@@ -564,16 +570,19 @@ public static ActivityPubObject parse(JsonObject obj, ParserContext parserContex
case "Create" -> new Create();
case "Delete" -> new Delete();
case "Follow" -> new Follow();
- case "Join" -> new Join();
+ case "Join" -> new Join(false);
+ case "TentativeJoin" -> new Join(true);
case "Like" -> new Like();
case "Undo" -> new Undo();
case "Update" -> new Update();
case "Reject" -> new Reject();
case "Offer" -> new Offer();
case "Block" -> new Block();
+ case "Invite" -> new Invite();
+ case "Remove" -> new Remove();
default -> {
- LOG.info("Unknown object type {}", type);
+ LOG.debug("Unknown object type {}", type);
yield null;
}
};
diff --git a/src/main/java/smithereen/activitypub/objects/Actor.java b/src/main/java/smithereen/activitypub/objects/Actor.java
index bce515f9..472d991f 100644
--- a/src/main/java/smithereen/activitypub/objects/Actor.java
+++ b/src/main/java/smithereen/activitypub/objects/Actor.java
@@ -2,6 +2,7 @@
import com.google.gson.JsonObject;
import com.google.gson.JsonParser;
+import com.google.gson.annotations.SerializedName;
import java.io.ByteArrayInputStream;
import java.io.IOException;
@@ -27,6 +28,7 @@
import smithereen.activitypub.ContextCollector;
import smithereen.activitypub.ParserContext;
import smithereen.data.CachedRemoteImage;
+import smithereen.data.Group;
import smithereen.data.NonCachedRemoteImage;
import smithereen.data.SizedImage;
import smithereen.exceptions.BadRequestException;
@@ -44,8 +46,11 @@ public abstract class Actor extends ActivityPubObject{
public URI sharedInbox;
public URI followers;
public URI following;
+ public URI collectionQueryEndpoint;
public Timestamp lastUpdated;
+ public String aboutSource;
+
public String getProfileURL(String action){
return "/"+getFullUsername()+"/"+action;
}
@@ -123,12 +128,13 @@ public JsonObject asActivityPubObject(JsonObject obj, ContextCollector contextCo
obj.addProperty("inbox", userURL+"/inbox");
obj.addProperty("outbox", userURL+"/outbox");
if(canBeFollowed())
- obj.addProperty("followers", userURL+"/followers");
+ obj.addProperty("followers", getFollowersURL().toString());
if(canFollowOtherActors())
obj.addProperty("following", userURL+"/following");
JsonObject endpoints=new JsonObject();
endpoints.addProperty("sharedInbox", Config.localURI("/activitypub/sharedInbox").toString());
+ endpoints.addProperty("collectionSimpleQuery", userURL+"/collectionQuery");
obj.add("endpoints", endpoints);
JsonObject pubkey=new JsonObject();
@@ -144,8 +150,9 @@ public JsonObject asActivityPubObject(JsonObject obj, ContextCollector contextCo
if(wallUrl!=null){
obj.addProperty("wall", wallUrl.toString());
contextCollector.addType("wall", "sm:wall", "@id");
- contextCollector.addAlias("sm", JLD.SMITHEREEN);
}
+ contextCollector.addAlias("collectionSimpleQuery", "sm:collectionSimpleQuery");
+ contextCollector.addAlias("sm", JLD.SMITHEREEN);
contextCollector.addSchema(JLD.W3_SECURITY);
@@ -173,7 +180,7 @@ protected ActivityPubObject parseActivityPubObject(JsonObject obj, ParserContext
if(!keyOwner.equals(activityPubID))
throw new IllegalArgumentException("Key owner ("+keyOwner+") is not equal to user ID ("+activityPubID+")");
String pkeyEncoded=pkey.get("publicKeyPem").getAsString();
- pkeyEncoded=pkeyEncoded.replaceAll("-----(BEGIN|END) (RSA )?PUBLIC KEY-----", "").replace("\n", "").trim();
+ pkeyEncoded=pkeyEncoded.replaceAll("-----(BEGIN|END) (RSA )?PUBLIC KEY-----", "").replaceAll("[^A-Za-z0-9+/=]", "").trim();
byte[] key=Base64.getDecoder().decode(pkeyEncoded);
try{
X509EncodedKeySpec spec=new X509EncodedKeySpec(key);
@@ -202,9 +209,9 @@ protected ActivityPubObject parseActivityPubObject(JsonObject obj, ParserContext
JsonObject endpoints=obj.getAsJsonObject("endpoints");
sharedInbox=tryParseURL(optString(endpoints, "sharedInbox"));
ensureHostMatchesID(sharedInbox, "sharedInbox");
+ collectionQueryEndpoint=tryParseURL(optString(endpoints, "collectionSimpleQuery"));
+ ensureHostMatchesID(collectionQueryEndpoint, "collectionSimpleQuery");
}
- if(sharedInbox==null)
- sharedInbox=inbox;
if(summary!=null)
summary=Utils.sanitizeHTML(summary);
@@ -249,7 +256,7 @@ private static int readDerLength(InputStream in) throws IOException{
length|=in.read() & 0xFF;
}
}
- return length;
+ return Math.min(length, in.available());
}
protected void fillFromResultSet(ResultSet res) throws SQLException{
@@ -276,6 +283,7 @@ protected void fillFromResultSet(ResultSet res) throws SQLException{
}
username=res.getString("username");
+ aboutSource=res.getString("about_source");
}
public boolean hasWall(){
@@ -284,12 +292,12 @@ public boolean hasWall(){
public void ensureLocal(){
if(StringUtils.isNotEmpty(domain))
- throw new IllegalArgumentException("Local actor is required here");
+ throw new IllegalArgumentException("Local actor is required here (got "+activityPubID+")");
}
public void ensureRemote(){
if(StringUtils.isEmpty(domain))
- throw new IllegalArgumentException("Remote actor is required here");
+ throw new IllegalArgumentException("Remote actor is required here (got "+activityPubID+")");
}
protected boolean canFollowOtherActors(){
@@ -299,4 +307,58 @@ protected boolean canFollowOtherActors(){
protected boolean canBeFollowed(){
return true;
}
+
+ public String getAboutSource(){
+ return StringUtils.isNotEmpty(aboutSource) ? aboutSource : summary;
+ }
+
+ public EndpointsStorageWrapper getEndpointsForStorage(){
+ if(StringUtils.isEmpty(domain))
+ return null;
+ EndpointsStorageWrapper ep=new EndpointsStorageWrapper();
+ if(followers!=null)
+ ep.followers=followers.toString();
+ if(following!=null)
+ ep.following=following.toString();
+ if(outbox!=null)
+ ep.outbox=outbox.toString();
+ URI wall=getWallURL();
+ if(wall!=null)
+ ep.wall=wall.toString();
+ if(collectionQueryEndpoint!=null)
+ ep.collectionQuery=collectionQueryEndpoint.toString();
+ return ep;
+ }
+
+ public String serializeEndpoints(){
+ EndpointsStorageWrapper endpoints=getEndpointsForStorage();
+ return endpoints!=null ? Utils.gson.toJson(endpoints) : null;
+ }
+
+ public int getOwnerID(){
+ return 0;
+ }
+
+ public static class EndpointsStorageWrapper{
+ @SerializedName("fs")
+ public String followers;
+ @SerializedName("fg")
+ public String following;
+ @SerializedName("ob")
+ public String outbox;
+ @SerializedName("wl")
+ public String wall;
+ @SerializedName("fr")
+ public String friends;
+ @SerializedName("gr")
+ public String groups;
+ @SerializedName("at")
+ public String actorToken;
+ @SerializedName("cq")
+ public String collectionQuery;
+ @SerializedName("gm")
+ public String groupMembers;
+ @SerializedName("tm")
+ public String tentativeGroupMembers;
+ }
}
diff --git a/src/main/java/smithereen/activitypub/objects/CollectionQueryResult.java b/src/main/java/smithereen/activitypub/objects/CollectionQueryResult.java
new file mode 100644
index 00000000..81696078
--- /dev/null
+++ b/src/main/java/smithereen/activitypub/objects/CollectionQueryResult.java
@@ -0,0 +1,34 @@
+package smithereen.activitypub.objects;
+
+import com.google.gson.JsonObject;
+
+import java.net.URI;
+import java.util.List;
+
+import smithereen.activitypub.ContextCollector;
+import smithereen.jsonld.JLD;
+
+public class CollectionQueryResult extends CollectionPage{
+ public CollectionQueryResult(){
+ super(false);
+ }
+
+ @Override
+ public String getType(){
+ return "CollectionQueryResult";
+ }
+
+ @Override
+ public JsonObject asActivityPubObject(JsonObject obj, ContextCollector contextCollector){
+ contextCollector.addAlias("sm", JLD.SMITHEREEN);
+ contextCollector.addAlias("CollectionQueryResult", "sm:CollectionQueryResult");
+ return super.asActivityPubObject(obj, contextCollector);
+ }
+
+ public static CollectionQueryResult empty(URI parent){
+ CollectionQueryResult r=new CollectionQueryResult();
+ r.items=List.of();
+ r.partOf=parent;
+ return r;
+ }
+}
diff --git a/src/main/java/smithereen/activitypub/objects/Event.java b/src/main/java/smithereen/activitypub/objects/Event.java
new file mode 100644
index 00000000..88d14b9f
--- /dev/null
+++ b/src/main/java/smithereen/activitypub/objects/Event.java
@@ -0,0 +1,8 @@
+package smithereen.activitypub.objects;
+
+public class Event extends ActivityPubObject{
+ @Override
+ public String getType(){
+ return "Event";
+ }
+}
diff --git a/src/main/java/smithereen/activitypub/objects/LinkOrObject.java b/src/main/java/smithereen/activitypub/objects/LinkOrObject.java
index 2cd8f6de..142d6deb 100644
--- a/src/main/java/smithereen/activitypub/objects/LinkOrObject.java
+++ b/src/main/java/smithereen/activitypub/objects/LinkOrObject.java
@@ -63,4 +63,8 @@ public int hashCode(){
public ActivityPubObject resolve(){
return null;
}
+
+ public T requireObject(){
+ return (T)Objects.requireNonNull(object);
+ }
}
diff --git a/src/main/java/smithereen/activitypub/objects/Tombstone.java b/src/main/java/smithereen/activitypub/objects/Tombstone.java
index bb488f3b..21bbc015 100644
--- a/src/main/java/smithereen/activitypub/objects/Tombstone.java
+++ b/src/main/java/smithereen/activitypub/objects/Tombstone.java
@@ -2,6 +2,7 @@
import com.google.gson.JsonObject;
+import java.time.Instant;
import java.util.Date;
import smithereen.Utils;
@@ -11,7 +12,7 @@
public class Tombstone extends ActivityPubObject{
public String formerType;
- public Date deleted;
+ public Instant deleted;
@Override
public String getType(){
diff --git a/src/main/java/smithereen/activitypub/objects/activities/Add.java b/src/main/java/smithereen/activitypub/objects/activities/Add.java
index ffa3bed4..0dbe0e82 100644
--- a/src/main/java/smithereen/activitypub/objects/activities/Add.java
+++ b/src/main/java/smithereen/activitypub/objects/activities/Add.java
@@ -1,10 +1,36 @@
package smithereen.activitypub.objects.activities;
+import com.google.gson.JsonObject;
+
+import smithereen.activitypub.ContextCollector;
+import smithereen.activitypub.ParserContext;
import smithereen.activitypub.objects.Activity;
+import smithereen.activitypub.objects.ActivityPubObject;
+import smithereen.jsonld.JLD;
public class Add extends Activity{
+ public boolean tentative;
+
@Override
public String getType(){
return "Add";
}
+
+ @Override
+ public JsonObject asActivityPubObject(JsonObject obj, ContextCollector contextCollector){
+ obj=super.asActivityPubObject(obj, contextCollector);
+ if(tentative){
+ obj.addProperty("tentative", true);
+ contextCollector.addAlias("sm", JLD.SMITHEREEN);
+ contextCollector.addAlias("tentative", "sm:tentative");
+ }
+ return obj;
+ }
+
+ @Override
+ protected ActivityPubObject parseActivityPubObject(JsonObject obj, ParserContext parserContext){
+ super.parseActivityPubObject(obj, parserContext);
+ tentative=optBoolean(obj, "tentative");
+ return this;
+ }
}
diff --git a/src/main/java/smithereen/activitypub/objects/activities/Invite.java b/src/main/java/smithereen/activitypub/objects/activities/Invite.java
new file mode 100644
index 00000000..5c3818d2
--- /dev/null
+++ b/src/main/java/smithereen/activitypub/objects/activities/Invite.java
@@ -0,0 +1,8 @@
+package smithereen.activitypub.objects.activities;
+
+public class Invite extends Offer{
+ @Override
+ public String getType(){
+ return "Invite";
+ }
+}
diff --git a/src/main/java/smithereen/activitypub/objects/activities/Join.java b/src/main/java/smithereen/activitypub/objects/activities/Join.java
index 72f22ab8..e4cb2b6b 100644
--- a/src/main/java/smithereen/activitypub/objects/activities/Join.java
+++ b/src/main/java/smithereen/activitypub/objects/activities/Join.java
@@ -1,8 +1,26 @@
package smithereen.activitypub.objects.activities;
+import com.google.gson.JsonObject;
+
+import smithereen.activitypub.ContextCollector;
+import smithereen.jsonld.JLD;
+
public class Join extends Follow{
+ public boolean tentative;
+
+ public Join(boolean tentative){
+ this.tentative=tentative;
+ }
+
@Override
public String getType(){
- return "Join";
+ return tentative ? "TentativeJoin" : "Join";
+ }
+
+ @Override
+ public JsonObject asActivityPubObject(JsonObject obj, ContextCollector contextCollector){
+ contextCollector.addAlias("TentativeJoin", "sm:TentativeJoin");
+ contextCollector.addAlias("sm", JLD.SMITHEREEN);
+ return super.asActivityPubObject(obj, contextCollector);
}
}
diff --git a/src/main/java/smithereen/controllers/FriendsController.java b/src/main/java/smithereen/controllers/FriendsController.java
new file mode 100644
index 00000000..7cb6de09
--- /dev/null
+++ b/src/main/java/smithereen/controllers/FriendsController.java
@@ -0,0 +1,93 @@
+package smithereen.controllers;
+
+import org.jetbrains.annotations.NotNull;
+
+import java.net.URI;
+import java.sql.SQLException;
+import java.util.Collection;
+import java.util.Map;
+
+import smithereen.ApplicationContext;
+import smithereen.data.FriendRequest;
+import smithereen.data.FriendshipStatus;
+import smithereen.data.PaginatedList;
+import smithereen.data.User;
+import smithereen.exceptions.InternalServerErrorException;
+import smithereen.storage.UserStorage;
+
+public class FriendsController{
+ private final ApplicationContext context;
+
+ public FriendsController(ApplicationContext context){
+ this.context=context;
+ }
+
+ public PaginatedList getIncomingFriendRequests(User self, int offset, int count){
+ try{
+ return UserStorage.getIncomingFriendRequestsForUser(self.id, offset, count);
+ }catch(SQLException x){
+ throw new InternalServerErrorException(x);
+ }
+ }
+
+ public PaginatedList getFollowers(User user, int offset, int count){
+ try{
+ return UserStorage.getNonMutualFollowers(user.id, true, true, offset, count);
+ }catch(SQLException x){
+ throw new InternalServerErrorException(x);
+ }
+ }
+
+ public PaginatedList getFollows(User user, int offset, int count){
+ try{
+ return UserStorage.getNonMutualFollowers(user.id, false, true, offset, count);
+ }catch(SQLException x){
+ throw new InternalServerErrorException(x);
+ }
+ }
+
+ public PaginatedList getFriends(User user, int offset, int count){
+ try{
+ return UserStorage.getFriendListForUser(user.id, offset, count);
+ }catch(SQLException x){
+ throw new InternalServerErrorException(x);
+ }
+ }
+
+ public PaginatedList getMutualFriends(User user, User otherUser, int offset, int count){
+ try{
+ if(user.id==otherUser.id)
+ throw new IllegalArgumentException("must be different users");
+ return UserStorage.getMutualFriendListForUser(user.id, otherUser.id, offset, count);
+ }catch(SQLException x){
+ throw new InternalServerErrorException(x);
+ }
+ }
+
+ public FriendshipStatus getFriendshipStatus(User self, User other){
+ try{
+ return UserStorage.getFriendshipStatus(self.id, other.id);
+ }catch(SQLException x){
+ throw new InternalServerErrorException(x);
+ }
+ }
+
+ public Map getFriendsByActivityPubIDs(@NotNull User user, Collection query){
+ try{
+ return UserStorage.getFriendsByActivityPubIDs(query, user.id);
+ }catch(SQLException x){
+ throw new InternalServerErrorException(x);
+ }
+ }
+
+ public void storeFriendship(@NotNull User user1, @NotNull User user2){
+ try{
+ if(UserStorage.getFriendshipStatus(user1.id, user2.id)==FriendshipStatus.FRIENDS)
+ return;
+ UserStorage.followUser(user1.id, user2.id, true, true);
+ UserStorage.followUser(user2.id, user1.id, true, true);
+ }catch(SQLException x){
+ throw new InternalServerErrorException(x);
+ }
+ }
+}
diff --git a/src/main/java/smithereen/controllers/GroupsController.java b/src/main/java/smithereen/controllers/GroupsController.java
new file mode 100644
index 00000000..661f0ef2
--- /dev/null
+++ b/src/main/java/smithereen/controllers/GroupsController.java
@@ -0,0 +1,601 @@
+package smithereen.controllers;
+
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.net.URI;
+import java.sql.SQLException;
+import java.time.Instant;
+import java.time.LocalDate;
+import java.time.ZoneId;
+import java.time.ZonedDateTime;
+import java.time.temporal.ChronoUnit;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+
+import smithereen.ApplicationContext;
+import smithereen.Config;
+import smithereen.LruCache;
+import smithereen.Utils;
+import smithereen.activitypub.objects.LinkOrObject;
+import smithereen.activitypub.objects.activities.Join;
+import smithereen.data.Account;
+import smithereen.data.EventReminder;
+import smithereen.data.ForeignGroup;
+import smithereen.data.ForeignUser;
+import smithereen.data.FriendshipStatus;
+import smithereen.data.Group;
+import smithereen.data.GroupAdmin;
+import smithereen.data.GroupInvitation;
+import smithereen.data.PaginatedList;
+import smithereen.data.User;
+import smithereen.data.UserNotifications;
+import smithereen.data.feed.NewsfeedEntry;
+import smithereen.exceptions.BadRequestException;
+import smithereen.exceptions.InternalServerErrorException;
+import smithereen.exceptions.ObjectNotFoundException;
+import smithereen.exceptions.UserActionNotAllowedException;
+import smithereen.exceptions.UserErrorException;
+import smithereen.storage.DatabaseUtils;
+import smithereen.storage.GroupStorage;
+import smithereen.storage.NewsfeedStorage;
+import smithereen.storage.NotificationsStorage;
+import smithereen.util.BackgroundTaskRunner;
+import spark.utils.StringUtils;
+
+import static smithereen.Utils.wrapError;
+
+public class GroupsController{
+ private static final Logger LOG=LoggerFactory.getLogger(GroupsController.class);
+
+ private final ApplicationContext context;
+ private final LruCache eventRemindersCache=new LruCache<>(500);
+
+ private final Object groupMembershipLock=new Object();
+
+ public GroupsController(ApplicationContext context){
+ this.context=context;
+ }
+
+ public Group createGroup(@NotNull User admin, @NotNull String name, @Nullable String description){
+ return createGroupInternal(admin, name, description, false, null, null);
+ }
+
+ public Group createEvent(@NotNull User admin, @NotNull String name, @Nullable String description, @NotNull Instant startTime, @Nullable Instant endTime){
+ return createGroupInternal(admin, name, description, true, startTime, endTime);
+ }
+
+ @NotNull
+ private Group createGroupInternal(User admin, String name, String description, boolean isEvent, Instant startTime, Instant endTime){
+ try{
+ if(StringUtils.isEmpty(name))
+ throw new IllegalArgumentException("name is empty");
+ if(isEvent && startTime==null)
+ throw new IllegalArgumentException("start time is required for event");
+ int id=GroupStorage.createGroup(name, Utils.preprocessPostHTML(description, null), description, admin.id, isEvent, startTime, endTime);
+ Group group=Objects.requireNonNull(GroupStorage.getById(id));
+ context.getActivityPubWorker().sendAddToGroupsCollectionActivity(admin, group, false);
+ NewsfeedStorage.putEntry(admin.id, group.id, isEvent ? NewsfeedEntry.Type.CREATE_EVENT : NewsfeedEntry.Type.CREATE_GROUP, null);
+ return group;
+ }catch(SQLException x){
+ throw new InternalServerErrorException(x);
+ }
+ }
+
+ public PaginatedList getUserGroups(@NotNull User user, @Nullable User self, int offset, int count){
+ try{
+ return GroupStorage.getUserGroups(user.id, offset, count, self!=null && self.id==user.id);
+ }catch(SQLException x){
+ throw new InternalServerErrorException(x);
+ }
+ }
+
+ public PaginatedList getUserManagedGroups(@NotNull User user, int offset, int count){
+ try{
+ return GroupStorage.getUserManagedGroups(user.id, offset, count);
+ }catch(SQLException x){
+ throw new InternalServerErrorException(x);
+ }
+ }
+
+ public PaginatedList getUserEvents(@NotNull User user, EventsType type, int offset, int count){
+ try{
+ return GroupStorage.getUserEvents(user.id, type, offset, count);
+ }catch(SQLException x){
+ throw new InternalServerErrorException(x);
+ }
+ }
+
+ public Group getGroupOrThrow(int id){
+ try{
+ if(id<=0)
+ throw new ObjectNotFoundException("err_group_not_found");
+ Group group=GroupStorage.getById(id);
+ if(group==null)
+ throw new ObjectNotFoundException("err_group_not_found");
+ return group;
+ }catch(SQLException x){
+ throw new InternalServerErrorException(x);
+ }
+ }
+
+ public Group getLocalGroupOrThrow(int id){
+ Group group=getGroupOrThrow(id);
+ if(group instanceof ForeignGroup)
+ throw new ObjectNotFoundException("err_group_not_found");
+ return group;
+ }
+
+ public List getGroupsByIdAsList(Collection ids){
+ try{
+ return GroupStorage.getByIdAsList(ids);
+ }catch(SQLException x){
+ throw new InternalServerErrorException(x);
+ }
+ }
+
+ public Map getGroupsByIdAsMap(Collection ids){
+ try{
+ return GroupStorage.getById(ids);
+ }catch(SQLException x){
+ throw new InternalServerErrorException(x);
+ }
+ }
+
+ public PaginatedList getMembers(@NotNull Group group, int offset, int count, boolean tentative){
+ try{
+ return GroupStorage.getMembers(group.id, offset, count, tentative);
+ }catch(SQLException x){
+ throw new InternalServerErrorException(x);
+ }
+ }
+
+ public PaginatedList getAllMembers(@NotNull Group group, int offset, int count){
+ try{
+ return GroupStorage.getMembers(group.id, offset, count, null);
+ }catch(SQLException x){
+ throw new InternalServerErrorException(x);
+ }
+ }
+
+ public List getAdmins(@NotNull Group group){
+ try{
+ return GroupStorage.getGroupAdmins(group.id);
+ }catch(SQLException x){
+ throw new InternalServerErrorException(x);
+ }
+ }
+
+ public List getRandomMembersForProfile(@NotNull Group group, boolean tentative){
+ try{
+ return GroupStorage.getRandomMembersForProfile(group.id, tentative);
+ }catch(SQLException x){
+ throw new InternalServerErrorException(x);
+ }
+ }
+
+ @NotNull
+ public Group.AdminLevel getMemberAdminLevel(@NotNull Group group, @NotNull User user){
+ try{
+ return GroupStorage.getGroupMemberAdminLevel(group.id, user.id);
+ }catch(SQLException x){
+ throw new InternalServerErrorException(x);
+ }
+ }
+
+ @NotNull
+ public Group.MembershipState getUserMembershipState(@NotNull Group group, @NotNull User user){
+ try{
+ return GroupStorage.getUserMembershipState(group.id, user.id);
+ }catch(SQLException x){
+ throw new InternalServerErrorException(x);
+ }
+ }
+
+ public void enforceUserAdminLevel(@NotNull Group group, @NotNull User user, @NotNull Group.AdminLevel atLeastLevel){
+ if(!getMemberAdminLevel(group, user).isAtLeast(atLeastLevel))
+ throw new UserActionNotAllowedException();
+ }
+
+ public void updateGroupInfo(@NotNull Group group, @NotNull User admin, String name, String aboutSrc, Instant eventStart, Instant eventEnd, String username, Group.AccessType accessType){
+ try{
+ enforceUserAdminLevel(group, admin, Group.AdminLevel.ADMIN);
+ String about=StringUtils.isNotEmpty(aboutSrc) ? Utils.preprocessPostHTML(aboutSrc, null) : null;
+ if(!group.username.equals(username)){
+ if(!Utils.isValidUsername(username))
+ throw new BadRequestException("err_group_invalid_username");
+ if(Utils.isReservedUsername(username))
+ throw new BadRequestException("err_group_reserved_username");
+ boolean result=DatabaseUtils.runWithUniqueUsername(username, ()->{
+ GroupStorage.updateGroupGeneralInfo(group, name, username, aboutSrc, about, eventStart, eventEnd, accessType);
+ });
+ if(!result)
+ throw new BadRequestException("err_group_username_taken");
+ }else{
+ GroupStorage.updateGroupGeneralInfo(group, name, username, aboutSrc, about, eventStart, eventEnd, accessType);
+ }
+ context.getActivityPubWorker().sendUpdateGroupActivity(group);
+ if(group.isEvent()){
+ BackgroundTaskRunner.getInstance().submit(()->{
+ try{
+ synchronized(eventRemindersCache){
+ GroupStorage.getAllMembersAsStream(group.id).boxed().forEach(eventRemindersCache::remove);
+ }
+ }catch(SQLException x){
+ LOG.warn("error getting group members", x);
+ }
+ });
+ }
+ }catch(SQLException x){
+ throw new InternalServerErrorException(x);
+ }
+ }
+
+ public void joinGroup(@NotNull Group group, @NotNull User user, boolean tentative){
+ joinGroup(group, user, tentative, false);
+ }
+
+ public void joinGroup(@NotNull Group group, @NotNull User user, boolean tentative, boolean forceAccepted){
+ try{
+ if(!forceAccepted)
+ Utils.ensureUserNotBlocked(user, group);
+ boolean autoAccepted=true;
+
+ synchronized(groupMembershipLock){
+ Group.MembershipState state=GroupStorage.getUserMembershipState(group.id, user.id);
+ if(!forceAccepted && !getMemberAdminLevel(group, user).isAtLeast(Group.AdminLevel.ADMIN)){
+ if(group.accessType==Group.AccessType.PRIVATE){
+ if(state!=Group.MembershipState.INVITED)
+ throw new UserActionNotAllowedException();
+ }else if(group.accessType==Group.AccessType.CLOSED){
+ autoAccepted=state==Group.MembershipState.INVITED;
+ }
+ }
+
+ if(group.isEvent()){
+ if((state==Group.MembershipState.MEMBER && !tentative) || (state==Group.MembershipState.TENTATIVE_MEMBER && tentative) || state==Group.MembershipState.REQUESTED){
+ if(forceAccepted)
+ return;
+ throw new UserErrorException("err_group_already_member");
+ }
+ }else{
+ if(state==Group.MembershipState.MEMBER || state==Group.MembershipState.TENTATIVE_MEMBER || state==Group.MembershipState.REQUESTED){
+ if(forceAccepted)
+ return;
+ throw new UserErrorException("err_group_already_member");
+ }
+ }
+
+ if(tentative && (!group.isEvent() || (group instanceof ForeignGroup fg && !fg.hasCapability(ForeignGroup.Capability.TENTATIVE_MEMBERSHIP))))
+ throw new BadRequestException();
+
+ // change certain <-> tentative
+ if(state==Group.MembershipState.MEMBER || state==Group.MembershipState.TENTATIVE_MEMBER){
+ GroupStorage.updateUserEventDecision(group, user.id, tentative);
+ if(!forceAccepted && group instanceof ForeignGroup fg)
+ context.getActivityPubWorker().sendJoinGroupActivity(user, fg, tentative);
+ return;
+ }
+
+ GroupStorage.joinGroup(group, user.id, tentative, forceAccepted || (!(group instanceof ForeignGroup) && autoAccepted));
+ }
+
+ if(!forceAccepted){
+ if(group instanceof ForeignGroup fg){
+ // Add{Group} will be sent upon receiving Accept{Follow}
+ context.getActivityPubWorker().sendJoinGroupActivity(user, fg, tentative);
+ }else{
+ if(group.accessType!=Group.AccessType.PRIVATE && autoAccepted){
+ context.getActivityPubWorker().sendAddToGroupsCollectionActivity(user, group, tentative);
+ NewsfeedStorage.putEntry(user.id, group.id, group.isEvent() ? NewsfeedEntry.Type.JOIN_EVENT : NewsfeedEntry.Type.JOIN_GROUP, null);
+ }
+ if(autoAccepted){
+ context.getActivityPubWorker().sendAddUserToGroupActivity(user, group, tentative);
+ }
+ }
+ }
+ if(group.isEvent()){
+ synchronized(eventRemindersCache){
+ eventRemindersCache.remove(user.id);
+ }
+ }
+ }catch(SQLException x){
+ throw new InternalServerErrorException(x);
+ }
+ }
+
+ public void leaveGroup(@NotNull Group group, @NotNull User user){
+ try{
+ Group.MembershipState state;
+ synchronized(groupMembershipLock){
+ state=GroupStorage.getUserMembershipState(group.id, user.id);
+ if(state!=Group.MembershipState.MEMBER && state!=Group.MembershipState.TENTATIVE_MEMBER && state!=Group.MembershipState.REQUESTED){
+ throw new UserErrorException("err_group_not_member");
+ }
+ GroupStorage.leaveGroup(group, user.id, state==Group.MembershipState.TENTATIVE_MEMBER, state!=Group.MembershipState.REQUESTED);
+ }
+ if(group instanceof ForeignGroup fg && !(user instanceof ForeignUser)){
+ context.getActivityPubWorker().sendLeaveGroupActivity(user, fg);
+ }
+ if(!(group instanceof ForeignGroup)){
+ context.getActivityPubWorker().sendRemoveUserFromGroupActivity(user, group, state==Group.MembershipState.TENTATIVE_MEMBER);
+ }
+ if(group.accessType!=Group.AccessType.PRIVATE)
+ context.getActivityPubWorker().sendRemoveFromGroupsCollectionActivity(user, group);
+ NewsfeedStorage.deleteEntry(user.id, group.id, group.isEvent() ? NewsfeedEntry.Type.JOIN_EVENT : NewsfeedEntry.Type.JOIN_GROUP);
+ if(group.isEvent()){
+ synchronized(eventRemindersCache){
+ eventRemindersCache.remove(user.id);
+ }
+ }
+ }catch(SQLException x){
+ throw new InternalServerErrorException(x);
+ }
+ }
+
+ public EventReminder getUserEventReminder(@NotNull User user, @NotNull ZoneId timeZone){
+ synchronized(eventRemindersCache){
+ EventReminder reminder=eventRemindersCache.get(user.id);
+ if(reminder!=null){
+ if(System.currentTimeMillis()-reminder.createdAt.toEpochMilli()<3600_000L && LocalDate.ofInstant(reminder.createdAt, timeZone).equals(LocalDate.now(timeZone)))
+ return reminder;
+ else
+ eventRemindersCache.remove(user.id);
+ }
+ }
+ try{
+ List events=GroupStorage.getUserEventsInTimeRange(user.id, Instant.now(), Instant.now().plus(2, ChronoUnit.DAYS));
+ EventReminder reminder=new EventReminder();
+ reminder.createdAt=Instant.now();
+ if(events.isEmpty()){
+ reminder.groupIDs=Collections.emptyList();
+ synchronized(eventRemindersCache){
+ eventRemindersCache.put(user.id, reminder);
+ return reminder;
+ }
+ }
+
+ ZonedDateTime now=ZonedDateTime.now(timeZone);
+ Instant todayEnd=now.toInstant().plusNanos(now.until(ZonedDateTime.of(now.getYear(), now.getMonthValue(), now.getDayOfMonth()+1, 0, 0, 0, 0, timeZone), ChronoUnit.NANOS));
+ Instant tomorrowEnd=todayEnd.plus(1, ChronoUnit.DAYS);
+ List eventsToday=new ArrayList<>(), eventsTomorrow=new ArrayList<>();
+ for(Group g:events){
+ if(g.eventStartTime.isBefore(todayEnd)){
+ eventsToday.add(g.id);
+ }else if(g.eventStartTime.isBefore(tomorrowEnd)){
+ eventsTomorrow.add(g.id);
+ }
+ }
+
+ if(!eventsToday.isEmpty()){
+ reminder.groupIDs=eventsToday;
+ reminder.day=LocalDate.now(timeZone);
+ }else if(!eventsTomorrow.isEmpty()){
+ reminder.groupIDs=eventsTomorrow;
+ reminder.day=LocalDate.now(timeZone).plusDays(1);
+ }else{
+ reminder.groupIDs=Collections.emptyList();
+ }
+
+ synchronized(eventRemindersCache){
+ eventRemindersCache.put(user.id, reminder);
+ return reminder;
+ }
+ }catch(SQLException x){
+ throw new InternalServerErrorException(x);
+ }
+ }
+
+ public List getUserEventsInMonth(@NotNull User user, int year, int month, @NotNull ZoneId timeZone){
+ try{
+ ZonedDateTime start=ZonedDateTime.of(year, month, 1, 0, 0, 0, 0, timeZone);
+ int numDays=LocalDate.of(year, month, 1).lengthOfMonth();
+ ZonedDateTime end=ZonedDateTime.of(year, month, numDays, 23, 59, 59, 0, timeZone);
+ return GroupStorage.getUserEventsInTimeRange(user.id, start.toInstant(), end.toInstant());
+ }catch(SQLException x){
+ throw new InternalServerErrorException(x);
+ }
+ }
+
+ public List getUserEventsOnDay(@NotNull User user, @NotNull LocalDate day, @NotNull ZoneId timeZone){
+ try{
+ Instant start=day.atStartOfDay(timeZone).toInstant();
+ return GroupStorage.getUserEventsInTimeRange(user.id, start, start.plusMillis(24*3600_000));
+ }catch(SQLException x){
+ throw new InternalServerErrorException(x);
+ }
+ }
+
+ public void inviteUserToGroup(@NotNull User self, @NotNull User who, @NotNull Group group){
+ try{
+ // This also takes care of checking whether anyone has blocked anyone
+ // Two users can't be friends if one blocked the other
+ if(context.getFriendsController().getFriendshipStatus(self, who)!=FriendshipStatus.FRIENDS)
+ throw new UserActionNotAllowedException();
+
+ Utils.ensureUserNotBlocked(self, group);
+ Utils.ensureUserNotBlocked(who, group);
+ Group.MembershipState selfState=GroupStorage.getUserMembershipState(group.id, self.id);
+ if(group.accessType==Group.AccessType.PRIVATE){
+ enforceUserAdminLevel(group, self, Group.AdminLevel.MODERATOR);
+ }else{
+ if(selfState!=Group.MembershipState.MEMBER && selfState!=Group.MembershipState.TENTATIVE_MEMBER)
+ throw new UserActionNotAllowedException();
+ }
+
+ int inviteID;
+ synchronized(groupMembershipLock){
+ switch(GroupStorage.getUserMembershipState(group.id, who.id)){
+ case NONE -> {} // allow
+ case MEMBER, TENTATIVE_MEMBER -> throw new BadRequestException(group.isEvent() ? "invite_already_in_event" : "invite_already_in_group");
+ case INVITED -> throw new BadRequestException(group.isEvent() ? "invite_already_invited_event" : "invite_already_invited_group");
+ }
+ inviteID=GroupStorage.putInvitation(group.id, self.id, who.id, group.isEvent(), null);
+ }
+ if(!(who instanceof ForeignUser)){
+ UserNotifications notifications=NotificationsStorage.getNotificationsFromCache(who.id);
+ if(notifications!=null){
+ if(group.isEvent())
+ notifications.incNewEventInvitationsCount(1);
+ else
+ notifications.incNewGroupInvitationsCount(1);
+ }
+ }
+ if(group instanceof ForeignGroup || who instanceof ForeignUser){
+ context.getActivityPubWorker().sendGroupInvite(inviteID, self, group, who);
+ }
+ }catch(SQLException x){
+ throw new InternalServerErrorException(x);
+ }
+ }
+
+ public PaginatedList getUserInvitations(@NotNull Account account, boolean isEvent, int offset, int count){
+ try{
+ UserNotifications ntf=NotificationsStorage.getNotificationsForUser(account.user.id, account.prefs.lastSeenNotificationID);
+ int total=isEvent ? ntf.getNewEventInvitationsCount() : ntf.getNewGroupInvitationsCount();
+ return new PaginatedList<>(GroupStorage.getUserInvitations(account.user.id, isEvent, offset, count), total, offset, count);
+ }catch(SQLException x){
+ throw new InternalServerErrorException(x);
+ }
+ }
+
+ public void declineInvitation(@NotNull User self, @NotNull Group group){
+ try{
+ URI apID=GroupStorage.getInvitationApID(self.id, group.id);
+ int localID=GroupStorage.deleteInvitation(self.id, group.id, group.isEvent());
+ if(localID>0 && group instanceof ForeignGroup fg){
+ context.getActivityPubWorker().sendRejectGroupInvite(self, fg, localID, apID);
+ }
+ }catch(SQLException x){
+ throw new InternalServerErrorException(x);
+ }
+ }
+
+ public void runLocked(@NotNull Runnable action){
+ synchronized(groupMembershipLock){
+ action.run();
+ }
+ }
+
+ public void removeUser(@NotNull User self, @NotNull Group group, @NotNull User user){
+ try{
+ enforceUserAdminLevel(group, self, Group.AdminLevel.MODERATOR);
+ if(GroupStorage.getGroupMemberAdminLevel(group.id, user.id).isAtLeast(Group.AdminLevel.MODERATOR))
+ throw new BadRequestException("Can't remove a group manager");
+
+ Group.MembershipState state;
+ synchronized(groupMembershipLock){
+ state=GroupStorage.getUserMembershipState(group.id, user.id);
+ if(state!=Group.MembershipState.MEMBER && state!=Group.MembershipState.TENTATIVE_MEMBER && state!=Group.MembershipState.REQUESTED){
+ throw new UserErrorException("err_group_not_member");
+ }
+ GroupStorage.leaveGroup(group, user.id, state==Group.MembershipState.TENTATIVE_MEMBER, state!=Group.MembershipState.REQUESTED);
+ }
+ if(user instanceof ForeignUser fu){
+ context.getActivityPubWorker().sendRejectFollowGroup(fu, group, state==Group.MembershipState.TENTATIVE_MEMBER);
+ }
+ if(!(group instanceof ForeignGroup)){
+ context.getActivityPubWorker().sendRemoveUserFromGroupActivity(user, group, state==Group.MembershipState.TENTATIVE_MEMBER);
+ }
+ }catch(SQLException x){
+ throw new InternalServerErrorException(x);
+ }
+ }
+
+ public PaginatedList getJoinRequests(@NotNull User self, @NotNull Group group, int offset, int count){
+ enforceUserAdminLevel(group, self, Group.AdminLevel.MODERATOR);
+ try{
+ return GroupStorage.getGroupJoinRequests(group.id, offset, count);
+ }catch(SQLException x){
+ throw new InternalServerErrorException(x);
+ }
+ }
+
+ public int getJoinRequestCount(@NotNull User self, @NotNull Group group){
+ enforceUserAdminLevel(group, self, Group.AdminLevel.MODERATOR);
+ try{
+ return GroupStorage.getJoinRequestCount(group.id);
+ }catch(SQLException x){
+ throw new InternalServerErrorException(x);
+ }
+ }
+
+ public void acceptJoinRequest(@NotNull User self, @NotNull Group group, @NotNull User user){
+ enforceUserAdminLevel(group, self, Group.AdminLevel.MODERATOR);
+ try{
+ synchronized(groupMembershipLock){
+ Group.MembershipState state=GroupStorage.getUserMembershipState(group.id, user.id);
+ if(state!=Group.MembershipState.REQUESTED)
+ throw new BadRequestException("No join request from this user");
+ GroupStorage.setMemberAccepted(group, user.id, true);
+ }
+ if(user instanceof ForeignUser fu){
+ Join join=new Join(false);
+ join.object=new LinkOrObject(group.activityPubID);
+ join.actor=new LinkOrObject(user.activityPubID);
+ join.to=List.of(new LinkOrObject(group.activityPubID));
+ context.getActivityPubWorker().sendAcceptFollowActivity(fu, group, join);
+ }
+ if(!(group instanceof ForeignGroup)){
+ context.getActivityPubWorker().sendAddUserToGroupActivity(user, group, false);
+ }
+ }catch(SQLException x){
+ throw new InternalServerErrorException(x);
+ }
+ }
+
+ public PaginatedList getGroupInvites(@NotNull User self, @NotNull Group group, int offset, int count){
+ enforceUserAdminLevel(group, self, Group.AdminLevel.MODERATOR);
+ try{
+ return GroupStorage.getGroupInvitations(group.id, offset, count);
+ }catch(SQLException x){
+ throw new InternalServerErrorException(x);
+ }
+ }
+
+ public void cancelInvitation(@NotNull User self, @NotNull Group group, @NotNull User user){
+ enforceUserAdminLevel(group, self, Group.AdminLevel.MODERATOR);
+ try{
+ URI apID=GroupStorage.getInvitationApID(user.id, group.id);
+ int id=GroupStorage.deleteInvitation(user.id, group.id, group.isEvent());
+ if(id<0)
+ throw new BadRequestException("This user was not invited to this group");
+ if(user instanceof ForeignUser fu){
+ if(apID==null){
+ apID=Config.localURI("/activitypub/objects/groupInvites/"+id);
+ }
+ context.getActivityPubWorker().sendUndoGroupInvite(fu, group, id, apID);
+ }
+ }catch(SQLException x){
+ throw new InternalServerErrorException(x);
+ }
+ }
+
+ public Map getMembersByActivityPubIDs(@NotNull Group group, Collection query, boolean tentative){
+ try{
+ return GroupStorage.getMembersByActivityPubIDs(query, group.id, tentative);
+ }catch(SQLException x){
+ throw new InternalServerErrorException(x);
+ }
+ }
+
+ public Map getUserGroupsByActivityPubIDs(@NotNull User user, Collection query){
+ try{
+ return GroupStorage.getUserGroupsByActivityPubIDs(query, user.id);
+ }catch(SQLException x){
+ throw new InternalServerErrorException(x);
+ }
+ }
+
+ public enum EventsType{
+ FUTURE,
+ PAST,
+ ALL
+ }
+}
diff --git a/src/main/java/smithereen/controllers/ObjectLinkResolver.java b/src/main/java/smithereen/controllers/ObjectLinkResolver.java
new file mode 100644
index 00000000..44534f2d
--- /dev/null
+++ b/src/main/java/smithereen/controllers/ObjectLinkResolver.java
@@ -0,0 +1,260 @@
+package smithereen.controllers;
+
+import com.google.gson.JsonObject;
+
+import org.jetbrains.annotations.NotNull;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.IOException;
+import java.net.URI;
+import java.sql.SQLException;
+import java.time.Instant;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Objects;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import smithereen.ApplicationContext;
+import smithereen.Config;
+import smithereen.Utils;
+import smithereen.activitypub.ActivityPub;
+import smithereen.activitypub.objects.ActivityPubObject;
+import smithereen.activitypub.objects.Actor;
+import smithereen.activitypub.objects.CollectionQueryResult;
+import smithereen.activitypub.objects.LinkOrObject;
+import smithereen.activitypub.objects.ServiceActor;
+import smithereen.data.ForeignGroup;
+import smithereen.data.ForeignUser;
+import smithereen.data.Group;
+import smithereen.data.Post;
+import smithereen.data.UriBuilder;
+import smithereen.data.User;
+import smithereen.exceptions.FederationException;
+import smithereen.exceptions.InternalServerErrorException;
+import smithereen.exceptions.ObjectNotFoundException;
+import smithereen.exceptions.UnsupportedRemoteObjectTypeException;
+import smithereen.storage.GroupStorage;
+import smithereen.storage.PostStorage;
+import smithereen.storage.UserStorage;
+
+import static smithereen.Utils.parseIntOrDefault;
+
+public class ObjectLinkResolver{
+
+ private static final Pattern POSTS=Pattern.compile("^/posts/(\\d+)$");
+ private static final Pattern USERS=Pattern.compile("^/users/(\\d+)$");
+ private static final Pattern GROUPS=Pattern.compile("^/groups/(\\d+)$");
+
+ private static final Logger LOG=LoggerFactory.getLogger(ObjectLinkResolver.class);
+
+ private final HashMap actorTokensCache=new HashMap<>();
+ private final HashMap actorTokenLocks=new HashMap<>();
+
+ private final ApplicationContext context;
+
+ public ObjectLinkResolver(ApplicationContext context){
+ this.context=context;
+ }
+
+ private Post getPost(String _id) throws SQLException{
+ int id=parseIntOrDefault(_id, 0);
+ if(id==0)
+ throw new ObjectNotFoundException("Invalid local post ID");
+ Post post=PostStorage.getPostByID(id, false);
+ if(post==null)
+ throw new ObjectNotFoundException("Post with ID "+id+" not found");
+ return post;
+ }
+
+ private User getUser(String _id){
+ int id=parseIntOrDefault(_id, 0);
+ if(id==0)
+ throw new ObjectNotFoundException();
+ return context.getUsersController().getLocalUserOrThrow(id);
+ }
+
+ private Group getGroup(String _id){
+ int id=parseIntOrDefault(_id, 0);
+ if(id==0)
+ throw new ObjectNotFoundException();
+ return context.getGroupsController().getLocalGroupOrThrow(id);
+ }
+
+ public ActivityPubObject resolve(URI link){
+ return resolve(link, ActivityPubObject.class, false, true, false);
+ }
+
+ public JsonObject getActorToken(Actor actor, Group group){
+ if(!(group instanceof ForeignGroup fg)){
+ return ActivityPub.generateActorToken(context, actor, group);
+ }else if(fg.actorTokenEndpoint==null){
+ return null;
+ }
+ boolean needWait;
+ Object lock;
+ synchronized(actorTokensCache){
+ ActorToken token=actorTokensCache.get(group.activityPubID);
+ if(token!=null && token.isValid())
+ return token.token;
+ if(!actorTokenLocks.containsKey(group.activityPubID)){
+ // This thread will request the token, other threads will wait
+ lock=new Object();
+ actorTokenLocks.put(group.activityPubID, lock);
+ needWait=false;
+ }else{
+ // Other thread is already requesting the token, we'll wait for it to do that
+ lock=actorTokenLocks.get(group.activityPubID);
+ needWait=true;
+ }
+ }
+ if(needWait){
+ synchronized(lock){
+ while(actorTokenLocks.containsKey(group.activityPubID)){
+ try{
+ lock.wait();
+ }catch(InterruptedException ignore){}
+ }
+ synchronized(actorTokensCache){
+ return actorTokensCache.get(group.activityPubID).token;
+ }
+ }
+ }else{
+ JsonObject token=ActivityPub.fetchActorToken(context, actor, fg);
+ synchronized(actorTokensCache){
+ if(token!=null)
+ actorTokensCache.put(group.activityPubID, new ActorToken(token, Utils.parseISODate(token.getAsJsonPrimitive("validUntil").getAsString())));
+ }
+ synchronized(lock){
+ actorTokenLocks.remove(group.activityPubID);
+ lock.notifyAll();
+ return token;
+ }
+ }
+ }
+
+ @NotNull
+ public T resolve(URI _link, Class expectedType, boolean allowFetching, boolean allowStorage, boolean forceRefetch){
+ return resolve(_link, expectedType, allowFetching, allowStorage, forceRefetch, (JsonObject) null, false);
+ }
+
+ @NotNull
+ public T resolve(URI _link, Class expectedType, boolean allowFetching, boolean allowStorage, boolean forceRefetch, Actor owner, boolean bypassCollectionCheck){
+ JsonObject actorToken=null;
+ if(!Config.isLocal(_link) && owner instanceof Group g && g.accessType!=Group.AccessType.OPEN){
+ actorToken=getActorToken(ServiceActor.getInstance(), g);
+ }
+ return resolve(_link, expectedType, allowFetching, allowStorage, forceRefetch, actorToken, bypassCollectionCheck);
+ }
+
+ @NotNull
+ public T resolve(URI _link, Class expectedType, boolean allowFetching, boolean allowStorage, boolean forceRefetch, JsonObject actorToken, boolean bypassCollectionCheck){
+ try{
+ LOG.debug("Resolving ActivityPub link: {}, expected type: {}", _link, expectedType.getName());
+ URI link;
+ if("bear".equals(_link.getScheme())){
+ link=URI.create(UriBuilder.parseQueryString(_link.getRawQuery()).get("u"));
+ }else{
+ link=_link;
+ }
+ if(!Config.isLocal(link)){
+ if(!forceRefetch){
+ if(expectedType.isAssignableFrom(ForeignUser.class)){
+ User user=UserStorage.getUserByActivityPubID(link);
+ if(user!=null)
+ return ensureTypeAndCast(user, expectedType);
+ }
+ if(expectedType.isAssignableFrom(ForeignGroup.class)){
+ ForeignGroup group=GroupStorage.getForeignGroupByActivityPubID(link);
+ if(group!=null)
+ return ensureTypeAndCast(group, expectedType);
+ }
+ if(expectedType.isAssignableFrom(Post.class)){
+ Post post=PostStorage.getPostByID(link);
+ if(post!=null)
+ return ensureTypeAndCast(post, expectedType);
+ }
+ }
+ if(allowFetching){
+ try{
+ ActivityPubObject obj=ActivityPub.fetchRemoteObject(_link, null, actorToken);
+ T o=ensureTypeAndCast(obj, expectedType);
+ o.resolveDependencies(context, allowFetching, allowStorage);
+ if(!bypassCollectionCheck && o instanceof Post post && post.getReplyLevel()==0){ // TODO make this a generalized interface OwnedObject or something
+ if(!Objects.equals(post.owner.activityPubID, post.user.activityPubID)){
+ ensureObjectIsInCollection(post.owner, post.owner.getWallURL(), post.activityPubID);
+ }
+ }
+ if(allowStorage)
+ storeOrUpdateRemoteObject(o);
+ return o;
+ }catch(IOException x){
+ throw new ObjectNotFoundException("Can't resolve remote object: "+link, x);
+ }
+ }
+ throw new ObjectNotFoundException("Can't resolve remote object locally: "+link);
+ }
+
+ Matcher matcher=POSTS.matcher(link.getPath());
+ if(matcher.find()){
+ return ensureTypeAndCast(getPost(matcher.group(1)), expectedType);
+ }
+
+ matcher=USERS.matcher(link.getPath());
+ if(matcher.find()){
+ return ensureTypeAndCast(getUser(matcher.group(1)), expectedType);
+ }
+
+ matcher=GROUPS.matcher(link.getPath());
+ if(matcher.find()){
+ return ensureTypeAndCast(getGroup(matcher.group(1)), expectedType);
+ }
+ }catch(SQLException x){
+ throw new InternalServerErrorException(x);
+ }
+
+ throw new ObjectNotFoundException("Invalid local URI");
+ }
+
+ public void storeOrUpdateRemoteObject(ActivityPubObject o){
+ try{
+ o.storeDependencies(context);
+ if(o instanceof ForeignUser fu)
+ UserStorage.putOrUpdateForeignUser(fu);
+ else if(o instanceof ForeignGroup fg)
+ GroupStorage.putOrUpdateForeignGroup(fg);
+ else if(o instanceof Post p)
+ PostStorage.putForeignWallPost(p);
+ }catch(SQLException x){
+ throw new InternalServerErrorException(x);
+ }
+ }
+
+ private static T ensureTypeAndCast(ActivityPubObject obj, Class type){
+ if(type.isInstance(obj))
+ return type.cast(obj);
+ throw new IllegalStateException("Expected object of type "+type.getName()+", but got "+obj.getClass().getName()+" instead");
+ }
+
+ public void ensureObjectIsInCollection(@NotNull Actor collectionOwner, @NotNull URI collectionID, @NotNull URI objectID){
+ LOG.debug("Checking whether object {} belongs to collection {} owned by {}", objectID, collectionID, collectionOwner.activityPubID);
+ if(Config.isLocal(collectionID))
+ throw new FederationException(collectionID+" is a local collection. Must submit this object with a Create activity first.");
+ if(collectionOwner.collectionQueryEndpoint==null)
+ return; // There's nothing we can do anyway
+ if(collectionID.getHost().equals(objectID.getHost()))
+ return; // This collection is on the same server as the object. We trust that that server is sane.
+ CollectionQueryResult cqr=ActivityPub.performCollectionQuery(collectionOwner, collectionID, List.of(objectID));
+ List res=cqr.items;
+ if(res.isEmpty() || !objectID.equals(res.get(0).link))
+ throw new FederationException("Object "+objectID+" is not in collection "+collectionID);
+ LOG.debug("Object {} was confirmed to be contained in {}", objectID, collectionID);
+ }
+
+ private record ActorToken(JsonObject token, Instant validUntil){
+ public boolean isValid(){
+ return validUntil.isAfter(Instant.now());
+ }
+ }
+}
diff --git a/src/main/java/smithereen/controllers/PrivacyController.java b/src/main/java/smithereen/controllers/PrivacyController.java
new file mode 100644
index 00000000..20838208
--- /dev/null
+++ b/src/main/java/smithereen/controllers/PrivacyController.java
@@ -0,0 +1,50 @@
+package smithereen.controllers;
+
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import smithereen.ApplicationContext;
+import smithereen.activitypub.objects.ActivityPubObject;
+import smithereen.data.Group;
+import smithereen.data.Post;
+import smithereen.data.User;
+import smithereen.exceptions.UserActionNotAllowedException;
+
+public class PrivacyController{
+ private final ApplicationContext context;
+
+ public PrivacyController(ApplicationContext context){
+ this.context=context;
+ }
+
+ public void enforceObjectPrivacy(@Nullable User self, @NotNull ActivityPubObject object){
+ if(object instanceof Post post){
+ if(post.owner instanceof Group group){
+ enforceUserAccessToGroupContent(self, group);
+ }
+ }
+ }
+
+ public void enforceUserAccessToGroupContent(@Nullable User self, @NotNull Group group){
+ if(group.accessType!=Group.AccessType.OPEN){
+ if(self==null)
+ throw new UserActionNotAllowedException();
+ Group.MembershipState state=context.getGroupsController().getUserMembershipState(group, self);
+ if(state!=Group.MembershipState.MEMBER && state!=Group.MembershipState.TENTATIVE_MEMBER)
+ throw new UserActionNotAllowedException();
+ }
+ }
+
+ public void enforceUserAccessToGroupProfile(@Nullable User self, @NotNull Group group){
+ // For closed groups, the profile is still accessible by everyone.
+ // For private groups, the profile is only accessible if you're a member or have a pending invite.
+ if(group.accessType==Group.AccessType.PRIVATE){
+ if(self==null)
+ throw new UserActionNotAllowedException();
+ Group.MembershipState state=context.getGroupsController().getUserMembershipState(group, self);
+ if(state!=Group.MembershipState.MEMBER && state!=Group.MembershipState.TENTATIVE_MEMBER && state!=Group.MembershipState.INVITED)
+ throw new UserActionNotAllowedException();
+ }
+ }
+
+}
diff --git a/src/main/java/smithereen/controllers/UserInteractionsController.java b/src/main/java/smithereen/controllers/UserInteractionsController.java
new file mode 100644
index 00000000..c0a89c98
--- /dev/null
+++ b/src/main/java/smithereen/controllers/UserInteractionsController.java
@@ -0,0 +1,33 @@
+package smithereen.controllers;
+
+import java.sql.SQLException;
+import java.util.Collections;
+import java.util.List;
+
+import smithereen.ApplicationContext;
+import smithereen.data.PaginatedList;
+import smithereen.data.Post;
+import smithereen.data.User;
+import smithereen.data.UserInteractions;
+import smithereen.exceptions.InternalServerErrorException;
+import smithereen.storage.LikeStorage;
+import smithereen.storage.PostStorage;
+import smithereen.storage.UserStorage;
+
+public class UserInteractionsController{
+ private final ApplicationContext context;
+
+ public UserInteractionsController(ApplicationContext context){
+ this.context=context;
+ }
+
+ public PaginatedList getLikesForObject(Post object, User self, int offset, int count){
+ try{
+ UserInteractions interactions=PostStorage.getPostInteractions(Collections.singletonList(object.id), 0).get(object.id);
+ List users=UserStorage.getByIdAsList(LikeStorage.getPostLikes(object.id, 0, offset, count));
+ return new PaginatedList<>(users, interactions.likeCount, offset, count);
+ }catch(SQLException x){
+ throw new InternalServerErrorException(x);
+ }
+ }
+}
diff --git a/src/main/java/smithereen/controllers/UsersController.java b/src/main/java/smithereen/controllers/UsersController.java
new file mode 100644
index 00000000..e0b26e2b
--- /dev/null
+++ b/src/main/java/smithereen/controllers/UsersController.java
@@ -0,0 +1,73 @@
+package smithereen.controllers;
+
+import java.sql.SQLException;
+import java.time.LocalDate;
+import java.time.ZoneId;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+
+import smithereen.ApplicationContext;
+import smithereen.data.ForeignUser;
+import smithereen.data.User;
+import smithereen.exceptions.InternalServerErrorException;
+import smithereen.exceptions.ObjectNotFoundException;
+import smithereen.storage.UserStorage;
+
+public class UsersController{
+ private final ApplicationContext context;
+
+ public UsersController(ApplicationContext context){
+ this.context=context;
+ }
+
+ public User getUserOrThrow(int id){
+ try{
+ if(id<=0)
+ throw new ObjectNotFoundException("err_user_not_found");
+ User user=UserStorage.getById(id);
+ if(user==null)
+ throw new ObjectNotFoundException("err_user_not_found");
+ return user;
+ }catch(SQLException x){
+ throw new InternalServerErrorException(x);
+ }
+ }
+
+ public User getLocalUserOrThrow(int id){
+ User user=getUserOrThrow(id);
+ if(user instanceof ForeignUser)
+ throw new ObjectNotFoundException("err_user_not_found");
+ return user;
+ }
+
+ public List getFriendsWithBirthdaysWithinTwoDays(User self, LocalDate date){
+ try{
+ ArrayList today=new ArrayList<>(), tomorrow=new ArrayList<>();
+ UserStorage.getFriendIdsWithBirthdaysTodayAndTomorrow(self.id, date, today, tomorrow);
+ if(today.isEmpty() && tomorrow.isEmpty())
+ return Collections.emptyList();
+ today.addAll(tomorrow);
+ return UserStorage.getByIdAsList(today);
+ }catch(SQLException x){
+ throw new InternalServerErrorException(x);
+ }
+ }
+
+ public List getFriendsWithBirthdaysInMonth(User self, int month){
+ try{
+ return UserStorage.getByIdAsList(UserStorage.getFriendsWithBirthdaysInMonth(self.id, month));
+ }catch(SQLException x){
+ throw new InternalServerErrorException(x);
+ }
+ }
+
+ public List getFriendsWithBirthdaysOnDay(User self, int month, int day){
+ try{
+ return UserStorage.getByIdAsList(UserStorage.getFriendsWithBirthdaysOnDay(self.id, month, day));
+ }catch(SQLException x){
+ throw new InternalServerErrorException(x);
+ }
+ }
+}
diff --git a/src/main/java/smithereen/controllers/WallController.java b/src/main/java/smithereen/controllers/WallController.java
index ba8503ae..0326ee28 100644
--- a/src/main/java/smithereen/controllers/WallController.java
+++ b/src/main/java/smithereen/controllers/WallController.java
@@ -9,28 +9,32 @@
import java.net.URI;
import java.sql.SQLException;
+import java.time.Instant;
+import java.time.temporal.ChronoUnit;
import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Date;
+import java.util.Collection;
+import java.util.HashSet;
import java.util.List;
+import java.util.Map;
import java.util.Objects;
+import java.util.Set;
+import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
import smithereen.ApplicationContext;
import smithereen.Utils;
import smithereen.activitypub.ActivityPub;
-import smithereen.activitypub.ActivityPubWorker;
import smithereen.activitypub.objects.ActivityPubObject;
import smithereen.activitypub.objects.Actor;
import smithereen.activitypub.objects.ForeignActor;
import smithereen.activitypub.objects.LocalImage;
-import smithereen.data.ForeignUser;
+import smithereen.activitypub.objects.Mention;
import smithereen.data.Group;
+import smithereen.data.PaginatedList;
import smithereen.data.Poll;
-import smithereen.data.PollOption;
import smithereen.data.Post;
import smithereen.data.User;
+import smithereen.data.UserInteractions;
import smithereen.data.UserPermissions;
import smithereen.data.notifications.NotificationUtils;
import smithereen.exceptions.BadRequestException;
@@ -41,22 +45,37 @@
import smithereen.storage.MediaStorageUtils;
import smithereen.storage.PostStorage;
import smithereen.storage.UserStorage;
+import smithereen.util.BackgroundTaskRunner;
import spark.utils.StringUtils;
-import static smithereen.Utils.ensureUserNotBlocked;
-import static smithereen.Utils.escapeHTML;
-import static smithereen.Utils.parseIntOrDefault;
-import static smithereen.Utils.preprocessPostHTML;
+import static smithereen.Utils.*;
public class WallController{
private static final Logger LOG=LoggerFactory.getLogger(WallController.class);
- private ApplicationContext context;
+ private final ApplicationContext context;
public WallController(ApplicationContext context){
this.context=context;
}
+ public void loadAndPreprocessRemotePostMentions(Post post){
+ if(post.tag!=null){
+ for(ActivityPubObject tag:post.tag){
+ if(tag instanceof Mention){
+ URI uri=((Mention) tag).href;
+ User mentionedUser=context.getObjectLinkResolver().resolve(uri, User.class, true, true, false);
+ if(post.mentionedUsers.isEmpty())
+ post.mentionedUsers=new HashSet<>();
+ post.mentionedUsers.add(mentionedUser);
+ }
+ }
+ if(!post.mentionedUsers.isEmpty() && StringUtils.isNotEmpty(post.content)){
+ post.content=Utils.preprocessRemotePostMentions(post.content, post.mentionedUsers);
+ }
+ }
+ }
+
/**
* Create a new wall post or comment.
* @param author Post author.
@@ -68,10 +87,13 @@ public WallController(ApplicationContext context){
* @param poll Poll to attach.
* @return The newly created post.
*/
- public Post createWallPost(@NotNull User author, @NotNull Actor wallOwner, int inReplyToID,
+ public Post createWallPost(@NotNull User author, int authorAccountID, @NotNull Actor wallOwner, int inReplyToID,
@NotNull String textSource, @Nullable String contentWarning, @NotNull List attachmentIDs,
@Nullable Poll poll){
try{
+ if(wallOwner instanceof Group group){
+ context.getPrivacyController().enforceUserAccessToGroupContent(author, group);
+ }
if(poll!=null && (StringUtils.isEmpty(poll.question) || poll.options.size()<2)){
LOG.warn("Invalid poll object passed to createWallPost: {}", poll);
poll=null;
@@ -80,7 +102,7 @@ public Post createWallPost(@NotNull User author, @NotNull Actor wallOwner, int i
if(textSource.length()==0 && attachmentIDs.isEmpty() && poll==null)
throw new BadRequestException("Empty post");
- if(!wallOwner.hasWall())
+ if(!wallOwner.hasWall() && inReplyToID==0)
throw new BadRequestException("This actor doesn't support wall posts");
Post parent=inReplyToID!=0 ? getPostOrThrow(inReplyToID) : null;
@@ -94,7 +116,7 @@ public Post createWallPost(@NotNull User author, @NotNull Actor wallOwner, int i
if(poll!=null){
List opts=poll.options.stream().map(o->o.name).collect(Collectors.toList());
if(opts.size()>=2){
- pollID=PostStorage.createPoll(author.id, poll.question, opts, poll.anonymous, poll.multipleChoice, poll.endTime);
+ pollID=PostStorage.createPoll(wallOwner.getOwnerID(), poll.question, opts, poll.anonymous, poll.multipleChoice, poll.endTime);
}
}
@@ -106,7 +128,7 @@ public Post createWallPost(@NotNull User author, @NotNull Actor wallOwner, int i
for(String id:attachmentIDs){
if(!id.matches("^[a-fA-F0-9]{32}$"))
continue;
- ActivityPubObject obj=MediaCache.getAndDeleteDraftAttachment(id, author.id);
+ ActivityPubObject obj=MediaCache.getAndDeleteDraftAttachment(id, authorAccountID);
if(obj!=null){
attachObjects.add(obj);
attachmentCount++;
@@ -137,8 +159,8 @@ public Post createWallPost(@NotNull User author, @NotNull Actor wallOwner, int i
if(text.length()==0 && StringUtils.isEmpty(attachments) && pollID==0)
throw new BadRequestException("Empty post");
- int ownerUserID=wallOwner instanceof User ? ((User) wallOwner).id : 0;
- int ownerGroupID=wallOwner instanceof Group ? ((Group) wallOwner).id : 0;
+ int ownerUserID=wallOwner instanceof User u ? u.id : 0;
+ int ownerGroupID=wallOwner instanceof Group g ? g.id : 0;
int[] replyKey;
if(parent!=null){
replyKey=new int[parent.replyKey.length+1];
@@ -172,9 +194,9 @@ public Post createWallPost(@NotNull User author, @NotNull Actor wallOwner, int i
if(post==null)
throw new IllegalStateException("?!");
if(inReplyToID==0 && (ownerGroupID!=0 || ownerUserID!=userID) && !(wallOwner instanceof ForeignActor)){
- ActivityPubWorker.getInstance().sendAddPostToWallActivity(post);
+ context.getActivityPubWorker().sendAddPostToWallActivity(post);
}else{
- ActivityPubWorker.getInstance().sendCreatePostActivity(post);
+ context.getActivityPubWorker().sendCreatePostActivity(post);
}
NotificationUtils.putNotificationsForPost(post, parent);
@@ -202,14 +224,7 @@ public User resolveMention(String username, String domain){
return user;
}
URI uri=ActivityPub.resolveUsername(username, domain);
- ActivityPubObject obj=ActivityPub.fetchRemoteObject(uri);
- if(obj instanceof ForeignUser){
- ForeignUser _user=(ForeignUser)obj;
- UserStorage.putOrUpdateForeignUser(_user);
- if(!mentionedUsers.contains(_user))
- mentionedUsers.add(_user);
- return _user;
- }
+ return context.getObjectLinkResolver().resolve(uri, User.class, true, true, false);
}catch(Exception x){
LOG.warn("Can't resolve {}@{}", username, domain, x);
}
@@ -282,11 +297,12 @@ public Post getLocalPostOrThrow(int id){
}
@NotNull
- public Post editPost(@NotNull UserPermissions permissions, int id, @NotNull String textSource, @Nullable String contentWarning, @NotNull List attachmentIDs, @Nullable Poll poll){
+ public Post editPost(@NotNull User self, @NotNull UserPermissions permissions, int id, @NotNull String textSource, @Nullable String contentWarning, @NotNull List attachmentIDs, @Nullable Poll poll){
try{
Post post=getPostOrThrow(id);
if(!permissions.canEditPost(post))
throw new UserActionNotAllowedException();
+ context.getPrivacyController().enforceObjectPrivacy(self, post);
if(textSource.length()==0 && attachmentIDs.isEmpty() && poll==null)
throw new BadRequestException("Empty post");
@@ -298,7 +314,7 @@ public Post editPost(@NotNull UserPermissions permissions, int id, @NotNull Stri
if(poll!=null && !Objects.equals(post.poll, poll)){
List opts=poll.options.stream().map(o->o.name).collect(Collectors.toList());
if(opts.size()>=2){
- pollID=PostStorage.createPoll(post.user.id, poll.question, opts, poll.anonymous, poll.multipleChoice, poll.endTime);
+ pollID=PostStorage.createPoll(post.owner.getOwnerID(), poll.question, opts, poll.anonymous, poll.multipleChoice, poll.endTime);
}
}
if(post.poll!=null && pollID==0){
@@ -314,8 +330,7 @@ public Post editPost(@NotNull UserPermissions permissions, int id, @NotNull Stri
ArrayList remainingAttachments=new ArrayList<>(attachmentIDs);
if(post.attachment!=null){
for(ActivityPubObject att:post.attachment){
- if(att instanceof LocalImage){
- LocalImage li=(LocalImage) att;
+ if(att instanceof LocalImage li){
if(!remainingAttachments.remove(li.localID)){
LOG.debug("Deleting attachment: {}", li.localID);
MediaStorageUtils.deleteAttachmentFiles(li);
@@ -357,10 +372,110 @@ public Post editPost(@NotNull UserPermissions permissions, int id, @NotNull Stri
PostStorage.updateWallPost(id, text, textSource, mentionedUsers, attachments, contentWarning, pollID);
post=getPostOrThrow(id);
- ActivityPubWorker.getInstance().sendUpdatePostActivity(post);
+ context.getActivityPubWorker().sendUpdatePostActivity(post);
return post;
}catch(SQLException x){
throw new InternalServerErrorException(x);
}
}
+
+ /**
+ * Get posts from a wall.
+ * @param owner Wall owner, either a user or a group
+ * @param ownOnly Whether to return only user's own posts or include other's posts
+ * @param offset Pagination offset
+ * @param count Maximum number of posts to return
+ * @return A reverse-chronologically sorted paginated list of wall posts
+ */
+ public PaginatedList getWallPosts(@NotNull Actor owner, boolean ownOnly, int offset, int count){
+ try{
+ int[] postCount={0};
+ List wall=PostStorage.getWallPosts(owner.getLocalID(), owner instanceof Group, 0, 0, offset, count, postCount, ownOnly);
+ return new PaginatedList<>(wall, postCount[0], offset, count);
+ }catch(SQLException x){
+ throw new InternalServerErrorException(x);
+ }
+ }
+
+ /**
+ * Get posts that two users posted on each other's walls.
+ * @param user The first user
+ * @param otherUser The second user
+ * @param offset Pagination offset
+ * @param count Maximum number of posts to return
+ * @return A reverse-chronologically sorted paginated list of wall posts
+ */
+ public PaginatedList getWallToWallPosts(@NotNull User user, @NotNull User otherUser, int offset, int count){
+ try{
+ int[] postCount={0};
+ List wall=PostStorage.getWallToWall(user.id, otherUser.id, offset, count, postCount);
+ return new PaginatedList<>(wall, postCount[0], offset, count);
+ }catch(SQLException x){
+ throw new InternalServerErrorException(x);
+ }
+ }
+
+ /**
+ * Add top-level comments to each post.
+ * @param posts List of posts to add comments to
+ */
+ public void populateCommentPreviews(@NotNull List posts){
+ try{
+ Set postIDs=posts.stream().map((Post p)->p.id).collect(Collectors.toSet());
+ Map> allComments=PostStorage.getRepliesForFeed(postIDs);
+ for(Post post:posts){
+ PaginatedList comments=allComments.get(post.id);
+ if(comments!=null){
+ post.repliesObjects=comments.list;
+ post.totalTopLevelComments=comments.total;
+ }
+ }
+ }catch(SQLException x){
+ throw new InternalServerErrorException(x);
+ }
+ }
+
+ /**
+ * Get {@link UserInteractions} for posts.
+ * @param posts List of posts to get user interactions for
+ * @param self Current user to check whether posts are liked
+ * @return A map from a post ID to a {@link UserInteractions} object for each post
+ */
+ public Map getUserInteractions(@NotNull List posts, @Nullable User self){
+ try{
+ Set postIDs=posts.stream().map((Post p)->p.id).collect(Collectors.toSet());
+ for(Post p:posts){
+ p.getAllReplyIDs(postIDs);
+ }
+ return PostStorage.getPostInteractions(postIDs, self!=null ? self.id : 0);
+ }catch(SQLException x){
+ throw new InternalServerErrorException(x);
+ }
+ }
+
+ public void sendUpdateQuestionIfNeeded(Post post){
+ if(post.poll==null)
+ throw new IllegalArgumentException("Post must have a poll");
+ if(!post.local)
+ return;
+
+ if(post.poll.lastVoteTime.until(Instant.now(), ChronoUnit.MINUTES)>=5){
+ BackgroundTaskRunner.getInstance().submitDelayed(()->{
+ try{
+ // Get post again so the poll inside is up-to-date.
+ context.getActivityPubWorker().sendUpdatePostActivity(getPostOrThrow(post.id));
+ }catch(Exception x){
+ LOG.warn("Error sending Update{Question}", x);
+ }
+ }, 5, TimeUnit.MINUTES);
+ }
+ }
+
+ public Map getPostLocalIDsByActivityPubIDs(@NotNull Collection ids, Actor owner){
+ try{
+ return PostStorage.getPostLocalIDsByActivityPubIDs(ids, owner instanceof User u ? u.id : 0, owner instanceof Group g ? g.id : 0);
+ }catch(SQLException x){
+ throw new InternalServerErrorException(x);
+ }
+ }
}
diff --git a/src/main/java/smithereen/data/Account.java b/src/main/java/smithereen/data/Account.java
index 4d171cc3..076ef30f 100644
--- a/src/main/java/smithereen/data/Account.java
+++ b/src/main/java/smithereen/data/Account.java
@@ -8,6 +8,7 @@
import java.time.Instant;
import smithereen.Utils;
+import smithereen.storage.DatabaseUtils;
import smithereen.storage.UserStorage;
public class Account{
@@ -16,8 +17,8 @@ public class Account{
public User user;
public AccessLevel accessLevel;
public UserPreferences prefs;
- public Timestamp createdAt;
- public Timestamp lastActive;
+ public Instant createdAt;
+ public Instant lastActive;
public BanInfo banInfo;
public User invitedBy; // used in admin UIs
@@ -42,8 +43,8 @@ public static Account fromResultSet(ResultSet res) throws SQLException{
acc.email=res.getString("email");
acc.accessLevel=AccessLevel.values()[res.getInt("access_level")];
acc.user=UserStorage.getById(res.getInt("user_id"));
- acc.createdAt=res.getTimestamp("created_at");
- acc.lastActive=res.getTimestamp("last_active");
+ acc.createdAt=DatabaseUtils.getInstant(res, "created_at");
+ acc.lastActive=DatabaseUtils.getInstant(res, "last_active");
String ban=res.getString("ban_info");
if(ban!=null)
acc.banInfo=Utils.gson.fromJson(ban, BanInfo.class);
diff --git a/src/main/java/smithereen/data/ActorWithDescription.java b/src/main/java/smithereen/data/ActorWithDescription.java
new file mode 100644
index 00000000..42bb953c
--- /dev/null
+++ b/src/main/java/smithereen/data/ActorWithDescription.java
@@ -0,0 +1,6 @@
+package smithereen.data;
+
+import smithereen.activitypub.objects.Actor;
+
+public record ActorWithDescription(Actor actor, String description){
+}
diff --git a/src/main/java/smithereen/data/EventReminder.java b/src/main/java/smithereen/data/EventReminder.java
new file mode 100644
index 00000000..aeb17ff1
--- /dev/null
+++ b/src/main/java/smithereen/data/EventReminder.java
@@ -0,0 +1,26 @@
+package smithereen.data;
+
+import java.time.Instant;
+import java.time.LocalDate;
+import java.util.List;
+
+public class EventReminder{
+ /**
+ * Day on which these events are.
+ */
+ public LocalDate day;
+ /**
+ * When this reminder was created.
+ */
+ public Instant createdAt;
+ public List groupIDs;
+
+ @Override
+ public String toString(){
+ return "EventReminder{"+
+ "day="+day+
+ ", createdAt="+createdAt+
+ ", groupIDs="+groupIDs+
+ '}';
+ }
+}
diff --git a/src/main/java/smithereen/data/ForeignGroup.java b/src/main/java/smithereen/data/ForeignGroup.java
index 38456294..0a50e521 100644
--- a/src/main/java/smithereen/data/ForeignGroup.java
+++ b/src/main/java/smithereen/data/ForeignGroup.java
@@ -8,12 +8,15 @@
import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.ArrayList;
+import java.util.EnumSet;
import java.util.Objects;
-import smithereen.ObjectLinkResolver;
+import smithereen.ApplicationContext;
+import smithereen.controllers.ObjectLinkResolver;
import smithereen.Utils;
import smithereen.activitypub.ParserContext;
import smithereen.activitypub.objects.ActivityPubObject;
+import smithereen.activitypub.objects.Event;
import smithereen.activitypub.objects.ForeignActor;
import smithereen.exceptions.BadRequestException;
import spark.utils.StringUtils;
@@ -21,6 +24,10 @@
public class ForeignGroup extends Group implements ForeignActor{
private URI wall;
+ public URI actorTokenEndpoint;
+ public URI members;
+ public URI tentativeMembers;
+ public EnumSet capabilities=EnumSet.noneOf(ForeignGroup.Capability.class);
public static ForeignGroup fromResultSet(ResultSet res) throws SQLException{
ForeignGroup g=new ForeignGroup();
@@ -35,11 +42,18 @@ protected void fillFromResultSet(ResultSet res) throws SQLException{
activityPubID=tryParseURL(res.getString("ap_id"));
url=tryParseURL(res.getString("ap_url"));
inbox=tryParseURL(res.getString("ap_inbox"));
- outbox=tryParseURL(res.getString("ap_outbox"));
sharedInbox=tryParseURL(res.getString("ap_shared_inbox"));
- followers=tryParseURL(res.getString("ap_followers"));
lastUpdated=res.getTimestamp("last_updated");
- wall=tryParseURL(res.getString("ap_wall"));
+ Utils.deserializeEnumSet(capabilities, ForeignGroup.Capability.class, res.getLong("flags"));
+
+ EndpointsStorageWrapper ep=Utils.gson.fromJson(res.getString("endpoints"), EndpointsStorageWrapper.class);
+ outbox=tryParseURL(ep.outbox);
+ followers=tryParseURL(ep.followers);
+ wall=tryParseURL(ep.wall);
+ actorTokenEndpoint=tryParseURL(ep.actorToken);
+ collectionQueryEndpoint=tryParseURL(ep.collectionQuery);
+ members=tryParseURL(ep.groupMembers);
+ tentativeMembers=tryParseURL(ep.tentativeGroupMembers);
}
@Override
@@ -60,6 +74,42 @@ protected ActivityPubObject parseActivityPubObject(JsonObject obj, ParserContext
}
}
wall=tryParseURL(optString(obj, "wall"));
+ ensureHostMatchesID(wall, "wall");
+
+ if(attachment!=null && !attachment.isEmpty()){
+ for(ActivityPubObject att:attachment){
+ if(att instanceof Event ev){
+ type=Type.EVENT;
+ eventStartTime=ev.startTime;
+ eventEndTime=ev.endTime;
+ }
+ }
+ }
+
+ if(obj.has("capabilities")){
+ JsonObject caps=obj.getAsJsonObject("capabilities");
+ if(optBoolean(caps, "acceptsJoins"))
+ capabilities.add(Capability.JOIN_LEAVE_ACTIVITIES);
+ if(optBoolean(caps, "tentativeMembership"))
+ capabilities.add(Capability.TENTATIVE_MEMBERSHIP);
+ }
+
+ String access=optString(obj, "accessType");
+ if(access!=null){
+ try{
+ accessType=AccessType.valueOf(access.toUpperCase());
+ }catch(IllegalArgumentException ignore){}
+ }
+ if(accessType==null){
+ accessType=optBoolean(obj, "manuallyApprovesFollowers") ? AccessType.CLOSED : AccessType.OPEN;
+ }
+ JsonObject endpoints=obj.getAsJsonObject("endpoints");
+ actorTokenEndpoint=tryParseURL(optString(endpoints, "actorToken"));
+ ensureHostMatchesID(actorTokenEndpoint, "endpoints.actorToken");
+ members=tryParseURL(optString(obj, "members"));
+ ensureHostMatchesID(members, "members");
+ tentativeMembers=tryParseURL(optString(obj, "tentativeMembers"));
+ ensureHostMatchesID(tentativeMembers, "tentativeMembers");
return this;
}
@@ -105,17 +155,17 @@ public URI getWallURL(){
}
@Override
- public void resolveDependencies(boolean allowFetching, boolean allowStorage) throws SQLException{
+ public void resolveDependencies(ApplicationContext context, boolean allowFetching, boolean allowStorage){
for(GroupAdmin adm:adminsForActivityPub){
- adm.user=ObjectLinkResolver.resolve(adm.activityPubUserID, User.class, allowFetching, allowStorage, false);
+ adm.user=context.getObjectLinkResolver().resolve(adm.activityPubUserID, User.class, allowFetching, allowStorage, false);
}
}
@Override
- public void storeDependencies() throws SQLException{
+ public void storeDependencies(ApplicationContext context){
for(GroupAdmin adm:adminsForActivityPub){
if(adm.user instanceof ForeignUser && adm.user.id==0){
- ObjectLinkResolver.storeOrUpdateRemoteObject(adm.user);
+ context.getObjectLinkResolver().storeOrUpdateRemoteObject(adm.user);
}
}
}
@@ -124,4 +174,40 @@ public void storeDependencies() throws SQLException{
public boolean needUpdate(){
return lastUpdated!=null && System.currentTimeMillis()-lastUpdated.getTime()>24L*60*60*1000;
}
+
+ @Override
+ public EndpointsStorageWrapper getEndpointsForStorage(){
+ EndpointsStorageWrapper ep=super.getEndpointsForStorage();
+ if(actorTokenEndpoint!=null)
+ ep.actorToken=actorTokenEndpoint.toString();
+ if(members!=null)
+ ep.groupMembers=members.toString();
+ if(tentativeMembers!=null)
+ ep.tentativeGroupMembers=tentativeMembers.toString();
+ return ep;
+ }
+
+ public URI getMembersCollection(){
+ return members!=null ? members : followers;
+ }
+
+ public boolean hasCapability(Capability cap){
+ return capabilities.contains(cap);
+ }
+
+ // for use from templates
+ public boolean hasCapability(String cap){
+ return hasCapability(Capability.valueOf(cap));
+ }
+
+ public enum Capability{
+ /**
+ * Supports Join{Group} and Leave{Group} instead of Follow{Group}/Undo{Follow{Group}}
+ */
+ JOIN_LEAVE_ACTIVITIES,
+ /**
+ * Supports tentative memberships (sm:TentativeJoin for joining and TentativeAccept for accepting invites)
+ */
+ TENTATIVE_MEMBERSHIP
+ }
}
diff --git a/src/main/java/smithereen/data/ForeignUser.java b/src/main/java/smithereen/data/ForeignUser.java
index 7174a619..6fc2ca5c 100644
--- a/src/main/java/smithereen/data/ForeignUser.java
+++ b/src/main/java/smithereen/data/ForeignUser.java
@@ -6,6 +6,7 @@
import java.sql.Date;
import java.sql.ResultSet;
import java.sql.SQLException;
+import java.time.LocalDate;
import smithereen.Utils;
import smithereen.activitypub.ParserContext;
@@ -31,14 +32,17 @@ protected void fillFromResultSet(ResultSet res) throws SQLException{
activityPubID=tryParseURL(res.getString("ap_id"));
url=tryParseURL(res.getString("ap_url"));
inbox=tryParseURL(res.getString("ap_inbox"));
- outbox=tryParseURL(res.getString("ap_outbox"));
sharedInbox=tryParseURL(res.getString("ap_shared_inbox"));
- followers=tryParseURL(res.getString("ap_followers"));
- following=tryParseURL(res.getString("ap_following"));
lastUpdated=res.getTimestamp("last_updated");
- wall=tryParseURL(res.getString("ap_wall"));
- friends=tryParseURL(res.getString("ap_friends"));
- groups=tryParseURL(res.getString("ap_groups"));
+
+ EndpointsStorageWrapper ep=Utils.gson.fromJson(res.getString("endpoints"), EndpointsStorageWrapper.class);
+ outbox=tryParseURL(ep.outbox);
+ followers=tryParseURL(ep.followers);
+ following=tryParseURL(ep.following);
+ wall=tryParseURL(ep.wall);
+ friends=tryParseURL(ep.friends);
+ groups=tryParseURL(ep.groups);
+ collectionQueryEndpoint=tryParseURL(ep.collectionQuery);
}
@Override
@@ -103,9 +107,15 @@ protected ActivityPubObject parseActivityPubObject(JsonObject obj, ParserContext
maidenName=optString(obj, "maidenName");
}else{
firstName=StringUtils.isNotEmpty(name) ? name : username;
+ // If there's a single space somewhere in the name, assume it's first and last names
+ int spaceIdx=firstName.indexOf(' ');
+ if(spaceIdx>0 && spaceIdx==firstName.lastIndexOf(' ')){
+ lastName=firstName.substring(spaceIdx+1);
+ firstName=firstName.substring(0, spaceIdx);
+ }
}
if(obj.has("vcard:bday")){
- birthDate=Date.valueOf(obj.get("vcard:bday").getAsString());
+ birthDate=LocalDate.parse(obj.get("vcard:bday").getAsString());
}
if(obj.has("gender")){
gender=switch(obj.get("gender").getAsString()){
@@ -117,7 +127,11 @@ protected ActivityPubObject parseActivityPubObject(JsonObject obj, ParserContext
gender=Gender.UNKNOWN;
}
manuallyApprovesFollowers=optBoolean(obj, "manuallyApprovesFollowers");
- if(optBoolean(obj, "supportsFriendRequests")){
+ JsonObject capabilities=optObject(obj, "capabilities");
+ if(capabilities!=null){
+ if(optBoolean(capabilities, "supportsFriendRequests"))
+ flags|=FLAG_SUPPORTS_FRIEND_REQS;
+ }else if(optBoolean(obj, "supportsFriendRequests")){
flags|=FLAG_SUPPORTS_FRIEND_REQS;
}
if(StringUtils.isNotEmpty(summary))
@@ -170,4 +184,14 @@ protected NonCachedRemoteImage.Args getAvatarArgs(){
public boolean needUpdate(){
return lastUpdated!=null && System.currentTimeMillis()-lastUpdated.getTime()>24L*60*60*1000;
}
+
+ @Override
+ public EndpointsStorageWrapper getEndpointsForStorage(){
+ EndpointsStorageWrapper ep=super.getEndpointsForStorage();
+ if(friends!=null)
+ ep.friends=friends.toString();
+ if(groups!=null)
+ ep.groups=groups.toString();
+ return ep;
+ }
}
diff --git a/src/main/java/smithereen/data/Group.java b/src/main/java/smithereen/data/Group.java
index d9e2b869..bcb566da 100644
--- a/src/main/java/smithereen/data/Group.java
+++ b/src/main/java/smithereen/data/Group.java
@@ -6,18 +6,26 @@
import java.net.URI;
import java.sql.ResultSet;
import java.sql.SQLException;
+import java.time.Instant;
+import java.util.EnumSet;
import java.util.List;
import smithereen.Config;
+import smithereen.Utils;
import smithereen.activitypub.ContextCollector;
import smithereen.activitypub.objects.Actor;
+import smithereen.activitypub.objects.Event;
import smithereen.jsonld.JLD;
+import smithereen.storage.DatabaseUtils;
import spark.utils.StringUtils;
public class Group extends Actor{
public int id;
- public int memberCount;
+ public int memberCount, tentativeMemberCount;
+ public Type type=Type.GROUP;
+ public Instant eventStartTime, eventEndTime;
+ public AccessType accessType;
public List adminsForActivityPub;
@@ -41,6 +49,11 @@ public int getLocalID(){
return id;
}
+ @Override
+ public int getOwnerID(){
+ return -id;
+ }
+
@Override
public URI getWallURL(){
return Config.localURI("/groups/"+id+"/wall");
@@ -64,7 +77,19 @@ protected void fillFromResultSet(ResultSet res) throws SQLException{
activityPubID=Config.localURI("/groups/"+id);
url=Config.localURI(username);
memberCount=res.getInt("member_count");
+ tentativeMemberCount=res.getInt("tentative_member_count");
summary=res.getString("about");
+ eventStartTime=DatabaseUtils.getInstant(res, "event_start_time");
+ eventEndTime=DatabaseUtils.getInstant(res, "event_end_time");
+ type=Type.values()[res.getInt("type")];
+ accessType=AccessType.values()[res.getInt("access_type")];
+
+ if(type==Type.EVENT){
+ Event event=new Event();
+ event.startTime=eventStartTime;
+ event.endTime=eventEndTime;
+ attachment=List.of(event);
+ }
}
@Override
@@ -83,19 +108,46 @@ public JsonObject asActivityPubObject(JsonObject obj, ContextCollector contextCo
}
obj.add("attributedTo", ar);
- obj.addProperty("members", userURL+"/followers");
+ obj.addProperty("members", userURL+"/members");
contextCollector.addType("members", "sm:members", "@id");
-
JsonObject capabilities=new JsonObject();
+
+ if(type==Type.EVENT){
+ obj.addProperty("tentativeMembers", userURL+"/tentativeMembers");
+ contextCollector.addType("tentativeMembers", "sm:tentativeMembers", "@id");
+ capabilities.addProperty("tentativeMembership", true);
+ contextCollector.addAlias("tentativeMembership", "sm:tentativeMembership");
+ }
+
+ contextCollector.addAlias("accessType", "sm:accessType");
+ obj.addProperty("accessType", accessType.toString().toLowerCase());
+ obj.addProperty("manuallyApprovesFollowers", accessType!=AccessType.OPEN);
+
capabilities.addProperty("acceptsJoins", true);
obj.add("capabilities", capabilities);
contextCollector.addAlias("capabilities", "litepub:capabilities");
contextCollector.addAlias("acceptsJoins", "litepub:acceptsJoins");
contextCollector.addAlias("litepub", JLD.LITEPUB);
+ JsonObject endpoints=obj.getAsJsonObject("endpoints");
+ if(accessType!=AccessType.OPEN){
+ endpoints.addProperty("actorToken", userURL+"/actorToken");
+ contextCollector.addAlias("actorToken", "sm:actorToken");
+ }
+
return obj;
}
+ public boolean isEvent(){
+ return type==Type.EVENT;
+ }
+
+ @Override
+ public URI getFollowersURL(){
+ String userURL=activityPubID.toString();
+ return URI.create(userURL+"/members");
+ }
+
public enum AdminLevel{
REGULAR,
MODERATOR,
@@ -116,10 +168,26 @@ public enum MembershipState{
MEMBER,
TENTATIVE_MEMBER,
INVITED,
+ REQUESTED,
}
public enum Type{
GROUP,
EVENT
}
+
+ public enum AccessType{
+ /**
+ * Fully public
+ */
+ OPEN,
+ /**
+ * Public profile, private content, admins accept new joins
+ */
+ CLOSED,
+ /**
+ * Doesn't acknowledge its existence unless you're a member, invite-only
+ */
+ PRIVATE
+ }
}
diff --git a/src/main/java/smithereen/data/GroupInvitation.java b/src/main/java/smithereen/data/GroupInvitation.java
new file mode 100644
index 00000000..4adfe7ef
--- /dev/null
+++ b/src/main/java/smithereen/data/GroupInvitation.java
@@ -0,0 +1,11 @@
+package smithereen.data;
+
+public class GroupInvitation{
+ public Group group;
+ public User inviter;
+
+ public GroupInvitation(Group group, User inviter){
+ this.group=group;
+ this.inviter=inviter;
+ }
+}
diff --git a/src/main/java/smithereen/data/Invitation.java b/src/main/java/smithereen/data/Invitation.java
index e6dbe277..042191d0 100644
--- a/src/main/java/smithereen/data/Invitation.java
+++ b/src/main/java/smithereen/data/Invitation.java
@@ -3,17 +3,19 @@
import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.Timestamp;
+import java.time.Instant;
import smithereen.Utils;
+import smithereen.storage.DatabaseUtils;
public class Invitation{
public String code;
- public Timestamp createdAt;
+ public Instant createdAt;
public static Invitation fromResultSet(ResultSet res) throws SQLException{
Invitation inv=new Invitation();
inv.code=Utils.byteArrayToHexString(res.getBytes("code"));
- inv.createdAt=res.getTimestamp("created");
+ inv.createdAt=DatabaseUtils.getInstant(res, "created");
return inv;
}
}
diff --git a/src/main/java/smithereen/data/ListAndTotal.java b/src/main/java/smithereen/data/ListAndTotal.java
deleted file mode 100644
index f75619d7..00000000
--- a/src/main/java/smithereen/data/ListAndTotal.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package smithereen.data;
-
-import java.util.List;
-
-public class ListAndTotal{
- public List list;
- public int total;
-
- public ListAndTotal(List list, int total){
- this.list=list;
- this.total=total;
- }
-}
diff --git a/src/main/java/smithereen/data/PaginatedList.java b/src/main/java/smithereen/data/PaginatedList.java
new file mode 100644
index 00000000..5ffc9c5e
--- /dev/null
+++ b/src/main/java/smithereen/data/PaginatedList.java
@@ -0,0 +1,28 @@
+package smithereen.data;
+
+import java.util.Collections;
+import java.util.List;
+
+public class PaginatedList{
+ public List list;
+ public int total;
+
+ public transient int offset;
+ public transient int perPage;
+
+ public PaginatedList(List list, int total){
+ this.list=list;
+ this.total=total;
+ }
+
+ public PaginatedList(List list, int total, int offset, int perPage){
+ this.list=list;
+ this.total=total;
+ this.offset=offset;
+ this.perPage=perPage;
+ }
+
+ public static PaginatedList emptyList(int perPage){
+ return new PaginatedList<>(Collections.emptyList(), 0, 0, perPage);
+ }
+}
diff --git a/src/main/java/smithereen/data/Poll.java b/src/main/java/smithereen/data/Poll.java
index dd390227..7e982d5e 100644
--- a/src/main/java/smithereen/data/Poll.java
+++ b/src/main/java/smithereen/data/Poll.java
@@ -4,11 +4,14 @@
import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.Timestamp;
+import java.time.Instant;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Objects;
+import smithereen.storage.DatabaseUtils;
+
public class Poll{
public int id;
public int ownerID;
@@ -16,9 +19,10 @@ public class Poll{
public boolean multipleChoice;
public boolean anonymous;
public List options;
- public Date endTime;
+ public Instant endTime;
public int numVoters;
public URI activityPubID;
+ public Instant lastVoteTime;
public static Poll fromResultSet(ResultSet res) throws SQLException{
Poll p=new Poll();
@@ -27,10 +31,9 @@ public static Poll fromResultSet(ResultSet res) throws SQLException{
p.question=res.getString("question");
p.multipleChoice=res.getBoolean("is_multi_choice");
p.anonymous=res.getBoolean("is_anonymous");
- Timestamp end=res.getTimestamp("end_time");
- if(end!=null)
- p.endTime=new Date(end.getTime());
+ p.endTime=DatabaseUtils.getInstant(res, "end_time");
p.numVoters=res.getInt("num_voted_users");
+ p.lastVoteTime=DatabaseUtils.getInstant(res, "last_vote_time");
p.options=new ArrayList<>();
String apID=res.getString("ap_id");
if(apID!=null)
@@ -69,7 +72,7 @@ public String toString(){
}
public boolean isExpired(){
- return endTime!=null && endTime.getTime() mentionedUsers=Collections.EMPTY_LIST;
+ public Set mentionedUsers=Collections.emptySet();
public Poll poll;
public String source;
@@ -110,8 +111,8 @@ protected void fillFromResultSet(ResultSet res) throws SQLException{
}
content=res.getString("text");
- published=res.getTimestamp("created_at");
- updated=res.getTimestamp("updated_at");
+ published=DatabaseUtils.getInstant(res, "created_at");
+ updated=DatabaseUtils.getInstant(res, "updated_at");
summary=res.getString("content_warning");
attributedTo=user.activityPubID;
@@ -145,7 +146,7 @@ protected void fillFromResultSet(ResultSet res) throws SQLException{
int[] mentions=Utils.deserializeIntArray(res.getBytes("mentions"));
if(mentions!=null && mentions.length>0){
- mentionedUsers=new ArrayList<>();
+ mentionedUsers=new HashSet<>();
if(tag==null)
tag=new ArrayList<>();
for(int id:mentions){
@@ -194,6 +195,7 @@ public JsonObject asActivityPubObject(JsonObject obj, ContextCollector contextCo
CollectionPage repliesPage=new CollectionPage(false);
repliesPage.next=Config.localURI("/posts/"+id+"/replies?page=1");
repliesPage.partOf=replies.activityPubID;
+ repliesPage.items=Collections.emptyList();
replies.first=new LinkOrObject(repliesPage);
root.add("replies", replies.asActivityPubObject(new JsonObject(), contextCollector));
@@ -222,7 +224,7 @@ public JsonObject asActivityPubObject(JsonObject obj, ContextCollector contextCo
}
root.add(poll.multipleChoice ? "anyOf" : "oneOf", opts);
if(poll.endTime!=null){
- root.addProperty(poll.endTime.getTime()"+content;
+ if(hasBogusURL)
+ content=content+""+url+"
";
content=Utils.sanitizeHTML(content);
if(obj.has("sensitive") && obj.get("sensitive").getAsBoolean() && summary!=null){
summary=Utils.sanitizeHTML(summary);
@@ -254,12 +260,14 @@ protected ActivityPubObject parseActivityPubObject(JsonObject obj, ParserContext
summary=null;
}
}
+ if(hasBogusURL)
+ url=activityPubID;
try{
user=UserStorage.getUserByActivityPubID(attributedTo);
if(url==null)
url=activityPubID;
if(published==null)
- published=new Date();
+ published=Instant.now();
ActivityPubObject target=parse(optObject(obj, "target"), parserContext);
if(target instanceof ActivityPubCollection && target.attributedTo!=null && target.activityPubID!=null && inReplyTo==null){
@@ -357,7 +365,7 @@ else if(!(tag instanceof ArrayList))
mention.href=parent.user.activityPubID;
tag.add(mention);
if(mentionedUsers.isEmpty())
- mentionedUsers=new ArrayList<>();
+ mentionedUsers=new HashSet<>();
mentionedUsers.add(parent.user);
owner=parent.owner;
}
@@ -460,12 +468,12 @@ public boolean isGroupOwner(){
}
@Override
- public void resolveDependencies(boolean allowFetching, boolean allowStorage) throws SQLException{
+ public void resolveDependencies(ApplicationContext context, boolean allowFetching, boolean allowStorage){
if(user==null){
- user=ObjectLinkResolver.resolve(attributedTo, ForeignUser.class, allowFetching, allowStorage, false);
+ user=context.getObjectLinkResolver().resolve(attributedTo, ForeignUser.class, allowFetching, allowStorage, false);
}
if(owner==null && activityPubTarget!=null){
- owner=ObjectLinkResolver.resolve(activityPubTarget.attributedTo, Actor.class, allowFetching, allowStorage, false);
+ owner=context.getObjectLinkResolver().resolve(activityPubTarget.attributedTo, Actor.class, allowFetching, allowStorage, false);
if(!activityPubTarget.activityPubID.equals(owner.getWallURL()))
owner=null;
}
@@ -474,11 +482,11 @@ public void resolveDependencies(boolean allowFetching, boolean allowStorage) thr
}
@Override
- public void storeDependencies() throws SQLException{
+ public void storeDependencies(ApplicationContext context){
if(user instanceof ForeignUser && user.id==0)
- ObjectLinkResolver.storeOrUpdateRemoteObject(user);
+ context.getObjectLinkResolver().storeOrUpdateRemoteObject(user);
if(owner!=user && ((owner instanceof ForeignUser && ((ForeignUser) owner).id==0) || (owner instanceof ForeignGroup && ((ForeignGroup) owner).id==0)))
- ObjectLinkResolver.storeOrUpdateRemoteObject(owner);
+ context.getObjectLinkResolver().storeOrUpdateRemoteObject(owner);
}
public URI getRepliesURL(){
diff --git a/src/main/java/smithereen/data/User.java b/src/main/java/smithereen/data/User.java
index e3b9f106..dc074915 100644
--- a/src/main/java/smithereen/data/User.java
+++ b/src/main/java/smithereen/data/User.java
@@ -8,6 +8,7 @@
import java.net.URI;
import java.sql.ResultSet;
import java.sql.SQLException;
+import java.time.LocalDate;
import java.util.ArrayList;
import java.util.Map;
@@ -17,18 +18,18 @@
import smithereen.activitypub.objects.Actor;
import smithereen.activitypub.objects.PropertyValue;
import smithereen.jsonld.JLD;
+import smithereen.storage.DatabaseUtils;
import spark.utils.StringUtils;
public class User extends Actor{
public static final long FLAG_SUPPORTS_FRIEND_REQS=1;
-
public int id;
public String firstName;
public String lastName;
public String middleName;
public String maidenName;
- public java.sql.Date birthDate;
+ public LocalDate birthDate;
public Gender gender;
public long flags;
@@ -117,7 +118,7 @@ protected void fillFromResultSet(ResultSet res) throws SQLException{
lastName=res.getString("lname");
middleName=res.getString("middle_name");
maidenName=res.getString("maiden_name");
- birthDate=res.getDate("bdate");
+ birthDate=DatabaseUtils.getLocalDate(res, "bdate");
gender=Gender.valueOf(res.getInt("gender"));
summary=res.getString("about");
flags=res.getLong("flags");
@@ -183,12 +184,18 @@ public JsonObject asActivityPubObject(JsonObject obj, ContextCollector contextCo
contextCollector.addAlias("middleName", "sc:additionalName");
contextCollector.addType("gender", "sc:gender", "sc:GenderType");
contextCollector.addAlias("sm", JLD.SMITHEREEN);
- contextCollector.addAlias("supportsFriendRequests", "sm:supportsFriendRequests");
contextCollector.addAlias("maidenName", "sm:maidenName");
contextCollector.addType("friends", "sm:friends", "@id");
contextCollector.addType("groups", "sm:groups", "@id");
contextCollector.addAlias("vcard", JLD.VCARD);
+ JsonObject capabilities=new JsonObject();
+ capabilities.addProperty("supportsFriendRequests", true);
+ obj.add("capabilities", capabilities);
+ contextCollector.addAlias("capabilities", "litepub:capabilities");
+ contextCollector.addAlias("supportsFriendRequests", "sm:supportsFriendRequests");
+ contextCollector.addAlias("litepub", JLD.LITEPUB);
+
return obj;
}
@@ -240,6 +247,11 @@ public int getLocalID(){
return id;
}
+ @Override
+ public int getOwnerID(){
+ return id;
+ }
+
@Override
public URI getWallURL(){
return Config.localURI("/users/"+id+"/wall");
diff --git a/src/main/java/smithereen/data/UserNotifications.java b/src/main/java/smithereen/data/UserNotifications.java
index b44d4c12..2f012bf9 100644
--- a/src/main/java/smithereen/data/UserNotifications.java
+++ b/src/main/java/smithereen/data/UserNotifications.java
@@ -7,6 +7,8 @@
public class UserNotifications{
private int newFriendRequests=0;
private int newNotifications=0;
+ private int newGroupInvitations;
+ private int newEventInvitations;
public synchronized int getNewFriendRequestCount(){
return newFriendRequests;
@@ -27,4 +29,20 @@ public synchronized void incNewNotificationsCount(int amount){
public synchronized void setNotificationsViewed(){
newNotifications=0;
}
+
+ public synchronized void incNewGroupInvitationsCount(int amount){
+ newGroupInvitations+=amount;
+ }
+
+ public synchronized int getNewGroupInvitationsCount(){
+ return newGroupInvitations;
+ }
+
+ public synchronized void incNewEventInvitationsCount(int amount){
+ newEventInvitations+=amount;
+ }
+
+ public synchronized int getNewEventInvitationsCount(){
+ return newEventInvitations;
+ }
}
diff --git a/src/main/java/smithereen/data/UserPermissions.java b/src/main/java/smithereen/data/UserPermissions.java
index 87dad398..dcd1170c 100644
--- a/src/main/java/smithereen/data/UserPermissions.java
+++ b/src/main/java/smithereen/data/UserPermissions.java
@@ -33,7 +33,7 @@ public boolean canDeletePost(Post post){
}
public boolean canEditPost(Post post){
- return post.user.id==userID && System.currentTimeMillis()-post.published.getTime()<24*3600_000L;
+ return post.user.id==userID && System.currentTimeMillis()-post.published.toEpochMilli()<24*3600_000L;
}
public boolean canEditGroup(Group group){
diff --git a/src/main/java/smithereen/data/feed/JoinEventNewsfeedEntry.java b/src/main/java/smithereen/data/feed/JoinEventNewsfeedEntry.java
new file mode 100644
index 00000000..623299a0
--- /dev/null
+++ b/src/main/java/smithereen/data/feed/JoinEventNewsfeedEntry.java
@@ -0,0 +1,7 @@
+package smithereen.data.feed;
+
+import smithereen.data.Group;
+
+public class JoinEventNewsfeedEntry extends NewsfeedEntry{
+ public Group event;
+}
diff --git a/src/main/java/smithereen/data/feed/NewsfeedEntry.java b/src/main/java/smithereen/data/feed/NewsfeedEntry.java
index a2dc0ece..1a9b2509 100644
--- a/src/main/java/smithereen/data/feed/NewsfeedEntry.java
+++ b/src/main/java/smithereen/data/feed/NewsfeedEntry.java
@@ -24,6 +24,10 @@ public String toString(){
'}';
}
+ public boolean isNonPost(){
+ return type!=Type.POST && type!=Type.RETOOT;
+ }
+
public enum Type{
/**
* New post. objectID is a post
@@ -41,5 +45,11 @@ public enum Type{
* Someone joined a group. objectID is a group
*/
JOIN_GROUP,
+ /**
+ * Someone joined an event. objectID is a group
+ */
+ JOIN_EVENT,
+ CREATE_GROUP,
+ CREATE_EVENT,
}
}
diff --git a/src/main/java/smithereen/data/notifications/Notification.java b/src/main/java/smithereen/data/notifications/Notification.java
index a0cfd724..ef0f8a95 100644
--- a/src/main/java/smithereen/data/notifications/Notification.java
+++ b/src/main/java/smithereen/data/notifications/Notification.java
@@ -3,6 +3,9 @@
import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.Timestamp;
+import java.time.Instant;
+
+import smithereen.storage.DatabaseUtils;
public class Notification{
public int id;
@@ -12,7 +15,7 @@ public class Notification{
public ObjectType relatedObjectType;
public int relatedObjectID;
public int actorID;
- public Timestamp time;
+ public Instant time;
public static Notification fromResultSet(ResultSet res) throws SQLException{
Notification n=new Notification();
@@ -25,7 +28,7 @@ public static Notification fromResultSet(ResultSet res) throws SQLException{
if(!res.wasNull())
n.relatedObjectType=ObjectType.values()[res.getInt("related_object_type")];
n.actorID=res.getInt("actor_id");
- n.time=res.getTimestamp("time");
+ n.time=DatabaseUtils.getInstant(res, "time");
return n;
}
diff --git a/src/main/java/smithereen/exceptions/FederationException.java b/src/main/java/smithereen/exceptions/FederationException.java
new file mode 100644
index 00000000..4101cda8
--- /dev/null
+++ b/src/main/java/smithereen/exceptions/FederationException.java
@@ -0,0 +1,19 @@
+package smithereen.exceptions;
+
+public class FederationException extends RuntimeException{
+ public FederationException(){
+ super();
+ }
+
+ public FederationException(String message){
+ super(message);
+ }
+
+ public FederationException(String message, Throwable cause){
+ super(message, cause);
+ }
+
+ public FederationException(Throwable cause){
+ super(cause);
+ }
+}
diff --git a/src/main/java/smithereen/exceptions/UserErrorException.java b/src/main/java/smithereen/exceptions/UserErrorException.java
new file mode 100644
index 00000000..5d49d69b
--- /dev/null
+++ b/src/main/java/smithereen/exceptions/UserErrorException.java
@@ -0,0 +1,18 @@
+package smithereen.exceptions;
+
+public class UserErrorException extends RuntimeException{
+ public UserErrorException(){
+ }
+
+ public UserErrorException(String message){
+ super(message);
+ }
+
+ public UserErrorException(String message, Throwable cause){
+ super(message, cause);
+ }
+
+ public UserErrorException(Throwable cause){
+ super(cause);
+ }
+}
diff --git a/src/main/java/smithereen/jsonld/JLDProcessor.java b/src/main/java/smithereen/jsonld/JLDProcessor.java
index 260c2678..7bfd0148 100644
--- a/src/main/java/smithereen/jsonld/JLDProcessor.java
+++ b/src/main/java/smithereen/jsonld/JLDProcessor.java
@@ -21,6 +21,7 @@
import java.util.HashMap;
import java.util.Locale;
import java.util.Map;
+import java.util.Objects;
public class JLDProcessor{
private static final Logger LOG=LoggerFactory.getLogger(JLDProcessor.class);
@@ -67,6 +68,19 @@ public class JLDProcessor{
lc.add("friends", idAndTypeObject("sm:friends", "@id"));
lc.add("groups", idAndTypeObject("sm:groups", "@id"));
lc.addProperty("nonAnonymous", "sm:nonAnonymous");
+ lc.addProperty("tentativeMembership", "sm:tentativeMembership");
+ lc.add("members", idAndTypeObject("sm:members", "@id"));
+ lc.add("tentativeMembers", idAndTypeObject("sm:tentativeMembers", "@id"));
+ lc.addProperty("TentativeJoin", "sm:TentativeJoin");
+ lc.addProperty("accessType", "sm:accessType");
+ lc.addProperty("actorToken", "sm:actorToken");
+ lc.addProperty("collectionSimpleQuery", "sm:collectionSimpleQuery");
+ lc.addProperty("CollectionQueryResult", "sm:CollectionQueryResult");
+ lc.addProperty("tentative", "sm:tentative");
+
+ // litepub aliases
+ lc.addProperty("capabilities", "litepub:capabilities");
+ lc.addProperty("acceptsJoins", "litepub:acceptsJoins");
localContext=updateContext(new JLDContext(), makeArray(JLD.ACTIVITY_STREAMS, JLD.W3_SECURITY, lc), new ArrayList<>(), null);
inverseLocalContext=createReverseContext(localContext);
@@ -86,8 +100,7 @@ public static JsonArray expandToArray(JsonElement src, URI baseURI){
return (JsonArray) result;
if(result==null)
return new JsonArray();
- if(result instanceof JsonObject){
- JsonObject _r=(JsonObject) result;
+ if(result instanceof JsonObject _r){
if(_r.size()==1 && _r.has("@graph"))
return _r.get("@graph").getAsJsonArray();
}
@@ -141,11 +154,7 @@ private static JsonObject idAndContainerObject(String id, String container){
private static String readResourceFile(String name){
try{
- InputStream in=JLDProcessor.class.getResourceAsStream("/jsonld-schemas/"+name+".jsonld");
- byte[] buf=new byte[in.available()];
- in.read(buf);
- in.close();
- return new String(buf, StandardCharsets.UTF_8);
+ return new String(Objects.requireNonNull(JLDProcessor.class.getResourceAsStream("/jsonld-schemas/"+name+".jsonld")).readAllBytes(), StandardCharsets.UTF_8);
}catch(IOException x){
return null;
}
@@ -157,24 +166,18 @@ private static JsonObject dereferenceContext(String iri){
}
if(schemaCache.containsKey(iri))
return schemaCache.get(iri);
- String file=null;
- switch(iri){
- case "https://www.w3.org/ns/activitystreams":
- file=readResourceFile("activitystreams");
- break;
- case "https://w3id.org/security/v1":
- file=readResourceFile("w3-security");
- break;
- case "https://w3id.org/identity/v1":
- file=readResourceFile("w3-identity");
- break;
- case "https://example.com/schemas/litepub-0.1.jsonld":
- file=readResourceFile("litepub-0.1");
- break;
- default:
+ String file=switch(iri){
+ case "https://www.w3.org/ns/activitystreams" -> readResourceFile("activitystreams");
+ case "https://w3id.org/security/v1" -> readResourceFile("w3-security");
+ case "https://w3id.org/identity/v1" -> readResourceFile("w3-identity");
+ case "https://example.com/schemas/litepub-0.1.jsonld" -> readResourceFile("litepub-0.1");
+ default -> {
LOG.warn("Can't dereference remote context '{}'", iri);
- //throw new JLDException("loading remote context failed");
- }
+ yield null;
+ }
+
+ //throw new JLDException("loading remote context failed");
+ };
if(file!=null){
JsonObject obj=JsonParser.parseString(file).getAsJsonObject();
schemaCache.put(iri, obj);
@@ -474,14 +477,14 @@ private static boolean isKeyword(String key){
private static JsonArray makeArray(Object... items){
JsonArray arr=new JsonArray(items.length);
for(Object item:items){
- if(item instanceof JsonElement)
- arr.add((JsonElement) item);
- else if(item instanceof String)
- arr.add((String)item);
- else if(item instanceof Number)
- arr.add((Number)item);
- else if(item instanceof Boolean)
- arr.add((Boolean)item);
+ if(item instanceof JsonElement jsonElement)
+ arr.add(jsonElement);
+ else if(item instanceof String str)
+ arr.add(str);
+ else if(item instanceof Number num)
+ arr.add(num);
+ else if(item instanceof Boolean b)
+ arr.add(b);
else
throw new IllegalArgumentException("Unsupported type "+item.getClass().getName());
}
@@ -1763,10 +1766,7 @@ public static JsonArray flatten(JsonElement element, URI baseURI){
nodeMap.add("@default", new JsonObject());
BlankNodeIdentifierGenerator idGen=new BlankNodeIdentifierGenerator();
JsonArray expanded=expandToArray(element, baseURI);
- //System.out.println(expanded.toString(4));
generateNodeMap(expanded, nodeMap, "@default", null, null, null, idGen);
- //generateNodeMap(element, nodeMap, "@default", null, null, null, idGen);
- //System.out.println(nodeMap.toString(4));
JsonObject defaultGraph=nodeMap.getAsJsonObject("@default");
for(String graphName:nodeMap.keySet()){
if("@default".equals(graphName))
@@ -1792,7 +1792,6 @@ public static JsonArray flatten(JsonElement element, URI baseURI){
if(!(node.has("@id") && node.size()==1))
flattened.add(node);
}
-// System.out.println(flattened.toString(4));
return flattened;
}
}
diff --git a/src/main/java/smithereen/jsonld/LinkedDataSignatures.java b/src/main/java/smithereen/jsonld/LinkedDataSignatures.java
index 55b65752..1dcddd50 100644
--- a/src/main/java/smithereen/jsonld/LinkedDataSignatures.java
+++ b/src/main/java/smithereen/jsonld/LinkedDataSignatures.java
@@ -13,6 +13,7 @@
import java.security.PublicKey;
import java.security.Signature;
import java.security.SignatureException;
+import java.time.Instant;
import java.util.Base64;
import java.util.Date;
@@ -24,7 +25,7 @@ public class LinkedDataSignatures{
public static void sign(JsonObject toSign, PrivateKey pkey, String keyID){
JsonObject options=new JsonObject();
options.addProperty("creator", keyID);
- options.addProperty("created", Utils.formatDateAsISO(new Date()));
+ options.addProperty("created", Utils.formatDateAsISO(Instant.now()));
options.addProperty("@context", JLD.W3_IDENTITY);
String cOptions=URDNA2015.canonicalize(options, null);
diff --git a/src/main/java/smithereen/lang/Lang.java b/src/main/java/smithereen/lang/Lang.java
index 201bbad1..b98ee4fc 100644
--- a/src/main/java/smithereen/lang/Lang.java
+++ b/src/main/java/smithereen/lang/Lang.java
@@ -13,7 +13,9 @@
import java.io.InputStream;
import java.io.InputStreamReader;
import java.nio.charset.StandardCharsets;
+import java.time.Instant;
import java.time.LocalDate;
+import java.time.ZoneId;
import java.time.ZonedDateTime;
import java.util.ArrayList;
import java.util.Arrays;
@@ -159,6 +161,12 @@ public String get(String key, Map formatArgs){
}
public void inflected(StringBuilder out, User.Gender gender, String first, String last, Inflector.Case _case){
+ if(inflector==null){
+ out.append(first);
+ if(StringUtils.isNotEmpty(last))
+ out.append(' ').append(last);
+ return;
+ }
if(gender==null || gender==User.Gender.UNKNOWN){
gender=inflector.detectGender(first, last, null);
}
@@ -169,7 +177,7 @@ public void inflected(StringBuilder out, User.Gender gender, String first, Strin
}else{
out.append(inflector.isInflectable(first) ? inflector.inflectNamePart(first, Inflector.NamePart.FIRST, gender, _case) : first);
if(StringUtils.isNotEmpty(last))
- out.append(' ').append(inflector.isInflectable(last) ? inflector.inflectNamePart(last, Inflector.NamePart.LAST, gender, _case) : first);
+ out.append(' ').append(inflector.isInflectable(last) ? inflector.inflectNamePart(last, Inflector.NamePart.LAST, gender, _case) : last);
}
}
@@ -180,11 +188,11 @@ public User.Gender detectGenderForName(String first, String last, String middle)
}
public String formatDay(LocalDate date){
- return get("date_format_other_year", Map.of("day", date.getDayOfMonth(), "month", get("month"+date.getMonthValue()+"_full"), "year", date.getYear()));
+ return get("date_format_other_year", Map.of("day", date.getDayOfMonth(), "month", get("month_full", Map.of("month", date.getMonthValue())), "year", date.getYear()));
}
- public String formatDate(Date date, TimeZone timeZone, boolean forceAbsolute){
- long ts=date.getTime();
+ public String formatDate(Instant date, TimeZone timeZone, boolean forceAbsolute){
+ long ts=date.toEpochMilli();
long tsNow=System.currentTimeMillis();
long diff=tsNow-ts;
@@ -199,7 +207,7 @@ public String formatDate(Date date, TimeZone timeZone, boolean forceAbsolute){
}
ZonedDateTime now=ZonedDateTime.now(timeZone.toZoneId());
- ZonedDateTime dt=date.toInstant().atZone(timeZone.toZoneId());
+ ZonedDateTime dt=date.atZone(timeZone.toZoneId());
String day=null;
if(Math.abs(diff)<=2*24*60*60*1000){
if(now.getYear()==dt.getYear() && now.getDayOfYear()==dt.getDayOfYear()){
@@ -216,15 +224,20 @@ public String formatDate(Date date, TimeZone timeZone, boolean forceAbsolute){
}
if(day==null){
if(now.getYear()==dt.getYear()){
- day=get("date_format_current_year", Map.of("day", dt.getDayOfMonth(), "month", get("month"+dt.getMonthValue()+"_full")));
+ day=get("date_format_current_year", Map.of("day", dt.getDayOfMonth(), "month", get("month_full", Map.of("month", dt.getMonthValue()))));
}else{
- day=get("date_format_other_year", Map.of("day", dt.getDayOfMonth(), "month", get("month"+dt.getMonthValue()+"_short"), "year", dt.getYear()));
+ day=get("date_format_other_year", Map.of("day", dt.getDayOfMonth(), "month", get("month_short", Map.of("month", dt.getMonthValue())), "year", dt.getYear()));
}
}
return get("date_time_format", Map.of("date", day, "time", String.format(locale, "%d:%02d", dt.getHour(), dt.getMinute())));
}
+ public String formatTime(Instant time, ZoneId timeZone){
+ ZonedDateTime dt=time.atZone(timeZone);
+ return String.format(locale, "%d:%02d", dt.getHour(), dt.getMinute());
+ }
+
public String getAsJS(String key){
if(!data.containsKey(key)){
if(fallback!=null)
diff --git a/src/main/java/smithereen/lang/RussianInflectionRulesGenerated.java b/src/main/java/smithereen/lang/RussianInflectionRulesGenerated.java
index 141b644e..6767f9b2 100644
--- a/src/main/java/smithereen/lang/RussianInflectionRulesGenerated.java
+++ b/src/main/java/smithereen/lang/RussianInflectionRulesGenerated.java
@@ -8,6 +8,7 @@
class RussianInflectionRulesGenerated{
public static String inflectLastName(String input, User.Gender gender, Inflector.Case _case, boolean firstWord){
+ if(_case==Inflector.Case.NOMINATIVE) return input;
String inputLower=input.toLowerCase();
if(firstWord && (inputLower.equals("бонч") || inputLower.equals("абдул") || inputLower.equals("белиц") || inputLower.equals("гасан") || inputLower.equals("дюссар") || inputLower.equals("дюмон") || inputLower.equals("книппер") || inputLower.equals("корвин") || inputLower.equals("ван") || inputLower.equals("шолом") || inputLower.equals("тер") || inputLower.equals("призван") || inputLower.equals("мелик") || inputLower.equals("вар") || inputLower.equals("фон"))){
return input;
@@ -15,36 +16,26 @@ public static String inflectLastName(String input, User.Gender gender, Inflector
if(inputLower.equals("дюма") || inputLower.equals("тома") || inputLower.equals("дега") || inputLower.equals("люка") || inputLower.equals("ферма") || inputLower.equals("гамарра") || inputLower.equals("петипа") || inputLower.equals("шандра") || inputLower.equals("скаля") || inputLower.equals("каруана")){
return input;
}
- if(inputLower.equals("гусь") || inputLower.equals("ремень") || inputLower.equals("камень") || inputLower.equals("онук") || inputLower.equals("богода") || inputLower.equals("нечипас") || inputLower.equals("долгопалец") || inputLower.equals("маненок") || inputLower.equals("рева") || inputLower.equals("кива")){
+ if(inputLower.equals("гусь") || inputLower.equals("ремень") || inputLower.equals("камень") || inputLower.equals("онук") || inputLower.equals("богода") || inputLower.equals("нечипас") || inputLower.equals("долгопалец") || inputLower.equals("маненок") || inputLower.equals("рева") || inputLower.equals("кива") || inputLower.equals("щёлок")){
return input;
}
if(gender==User.Gender.MALE && (inputLower.equals("вий") || inputLower.equals("сой") || inputLower.equals("цой") || inputLower.equals("хой"))){
- switch(_case){
- case GENITIVE:
- return input.substring(0, input.length()-1)+"я";
- case DATIVE:
- return input.substring(0, input.length()-1)+"ю";
- case ACCUSATIVE:
- return input.substring(0, input.length()-1)+"я";
- case INSTRUMENTAL:
- return input.substring(0, input.length()-1)+"ем";
- case PREPOSITIONAL:
- return input.substring(0, input.length()-1)+"е";
- }
+ return input.substring(0, input.length()-1)+switch(_case){
+ case GENITIVE, ACCUSATIVE -> "я";
+ case DATIVE -> "ю";
+ case INSTRUMENTAL -> "ем";
+ case PREPOSITIONAL -> "е";
+ default -> throw new IllegalArgumentException();
+ };
}
if(gender==User.Gender.MALE && (inputLower.equals("грин") || inputLower.equals("дарвин") || inputLower.equals("регин") || inputLower.equals("цин"))){
- switch(_case){
- case GENITIVE:
- return input+"а";
- case DATIVE:
- return input+"у";
- case ACCUSATIVE:
- return input+"а";
- case INSTRUMENTAL:
- return input+"ом";
- case PREPOSITIONAL:
- return input+"е";
- }
+ return input+switch(_case){
+ case GENITIVE, ACCUSATIVE -> "а";
+ case DATIVE -> "у";
+ case INSTRUMENTAL -> "ом";
+ case PREPOSITIONAL -> "е";
+ default -> throw new IllegalArgumentException();
+ };
}
if(gender==User.Gender.FEMALE && (inputLower.endsWith("б") || inputLower.endsWith("в") || inputLower.endsWith("г") || inputLower.endsWith("д") || inputLower.endsWith("ж") || inputLower.endsWith("з") || inputLower.endsWith("й") || inputLower.endsWith("к") || inputLower.endsWith("л") || inputLower.endsWith("м") || inputLower.endsWith("н") || inputLower.endsWith("п") || inputLower.endsWith("р") || inputLower.endsWith("с") || inputLower.endsWith("т") || inputLower.endsWith("ф") || inputLower.endsWith("х") || inputLower.endsWith("ц") || inputLower.endsWith("ч") || inputLower.endsWith("ш") || inputLower.endsWith("щ") || inputLower.endsWith("ъ") || inputLower.endsWith("ь"))){
return input;
@@ -53,130 +44,76 @@ public static String inflectLastName(String input, User.Gender gender, Inflector
return input;
}
if(gender==User.Gender.FEMALE && (inputLower.endsWith("ска") || inputLower.endsWith("цка"))){
- switch(_case){
- case GENITIVE:
- return input.substring(0, input.length()-1)+"ой";
- case DATIVE:
- return input.substring(0, input.length()-1)+"ой";
- case ACCUSATIVE:
- return input.substring(0, input.length()-1)+"ую";
- case INSTRUMENTAL:
- return input.substring(0, input.length()-1)+"ой";
- case PREPOSITIONAL:
- return input.substring(0, input.length()-1)+"ой";
- }
+ return input.substring(0, input.length()-1)+switch(_case){
+ case GENITIVE, PREPOSITIONAL, INSTRUMENTAL, DATIVE -> "ой";
+ case ACCUSATIVE -> "ую";
+ default -> throw new IllegalArgumentException();
+ };
}
if(gender==User.Gender.FEMALE && (inputLower.endsWith("чая"))){
- switch(_case){
- case GENITIVE:
- return input.substring(0, input.length()-2)+"ей";
- case DATIVE:
- return input.substring(0, input.length()-2)+"ей";
- case ACCUSATIVE:
- return input.substring(0, input.length()-2)+"ую";
- case INSTRUMENTAL:
- return input.substring(0, input.length()-2)+"ей";
- case PREPOSITIONAL:
- return input.substring(0, input.length()-2)+"ей";
- }
+ return input.substring(0, input.length()-2)+switch(_case){
+ case GENITIVE, PREPOSITIONAL, INSTRUMENTAL, DATIVE -> "ей";
+ case ACCUSATIVE -> "ую";
+ default -> throw new IllegalArgumentException();
+ };
}
if(gender==User.Gender.MALE && (inputLower.endsWith("чий"))){
- switch(_case){
- case GENITIVE:
- return input.substring(0, input.length()-2)+"его";
- case DATIVE:
- return input.substring(0, input.length()-2)+"ему";
- case ACCUSATIVE:
- return input.substring(0, input.length()-2)+"его";
- case INSTRUMENTAL:
- return input.substring(0, input.length()-2)+"им";
- case PREPOSITIONAL:
- return input.substring(0, input.length()-2)+"ем";
- }
+ return input.substring(0, input.length()-2)+switch(_case){
+ case GENITIVE, ACCUSATIVE -> "его";
+ case DATIVE -> "ему";
+ case INSTRUMENTAL -> "им";
+ case PREPOSITIONAL -> "ем";
+ default -> throw new IllegalArgumentException();
+ };
}
if(gender==User.Gender.FEMALE && (inputLower.endsWith("цкая") || inputLower.endsWith("ская") || inputLower.endsWith("ная") || inputLower.endsWith("ая"))){
- switch(_case){
- case GENITIVE:
- return input.substring(0, input.length()-2)+"ой";
- case DATIVE:
- return input.substring(0, input.length()-2)+"ой";
- case ACCUSATIVE:
- return input.substring(0, input.length()-2)+"ую";
- case INSTRUMENTAL:
- return input.substring(0, input.length()-2)+"ой";
- case PREPOSITIONAL:
- return input.substring(0, input.length()-2)+"ой";
- }
+ return input.substring(0, input.length()-2)+switch(_case){
+ case GENITIVE, PREPOSITIONAL, INSTRUMENTAL, DATIVE -> "ой";
+ case ACCUSATIVE -> "ую";
+ default -> throw new IllegalArgumentException();
+ };
}
if(gender==User.Gender.FEMALE && (inputLower.endsWith("яя"))){
- switch(_case){
- case GENITIVE:
- return input.substring(0, input.length()-2)+"ей";
- case DATIVE:
- return input.substring(0, input.length()-2)+"ей";
- case ACCUSATIVE:
- return input.substring(0, input.length()-2)+"юю";
- case INSTRUMENTAL:
- return input.substring(0, input.length()-2)+"ей";
- case PREPOSITIONAL:
- return input.substring(0, input.length()-2)+"ей";
- }
+ return input.substring(0, input.length()-2)+switch(_case){
+ case GENITIVE, PREPOSITIONAL, INSTRUMENTAL, DATIVE -> "ей";
+ case ACCUSATIVE -> "юю";
+ default -> throw new IllegalArgumentException();
+ };
}
if(gender==User.Gender.MALE && (inputLower.endsWith("иной") || inputLower.endsWith("уй"))){
- switch(_case){
- case GENITIVE:
- return input.substring(0, input.length()-1)+"я";
- case DATIVE:
- return input.substring(0, input.length()-1)+"ю";
- case ACCUSATIVE:
- return input.substring(0, input.length()-1)+"я";
- case INSTRUMENTAL:
- return input.substring(0, input.length()-1)+"ем";
- case PREPOSITIONAL:
- return input.substring(0, input.length()-1)+"е";
- }
+ return input.substring(0, input.length()-1)+switch(_case){
+ case GENITIVE, ACCUSATIVE -> "я";
+ case DATIVE -> "ю";
+ case INSTRUMENTAL -> "ем";
+ case PREPOSITIONAL -> "е";
+ default -> throw new IllegalArgumentException();
+ };
}
if(inputLower.endsWith("ца")){
- switch(_case){
- case GENITIVE:
- return input.substring(0, input.length()-1)+"ы";
- case DATIVE:
- return input.substring(0, input.length()-1)+"е";
- case ACCUSATIVE:
- return input.substring(0, input.length()-1)+"у";
- case INSTRUMENTAL:
- return input.substring(0, input.length()-1)+"ей";
- case PREPOSITIONAL:
- return input.substring(0, input.length()-1)+"е";
- }
+ return input.substring(0, input.length()-1)+switch(_case){
+ case GENITIVE -> "ы";
+ case DATIVE, PREPOSITIONAL -> "е";
+ case ACCUSATIVE -> "у";
+ case INSTRUMENTAL -> "ей";
+ default -> throw new IllegalArgumentException();
+ };
}
if(gender==User.Gender.MALE && (inputLower.endsWith("рих"))){
- switch(_case){
- case GENITIVE:
- return input+"а";
- case DATIVE:
- return input+"у";
- case ACCUSATIVE:
- return input+"а";
- case INSTRUMENTAL:
- return input+"ом";
- case PREPOSITIONAL:
- return input+"е";
- }
+ return input+switch(_case){
+ case GENITIVE, ACCUSATIVE -> "а";
+ case DATIVE -> "у";
+ case INSTRUMENTAL -> "ом";
+ case PREPOSITIONAL -> "е";
+ default -> throw new IllegalArgumentException();
+ };
}
if(inputLower.endsWith("ия")){
- switch(_case){
- case GENITIVE:
- return input.substring(0, input.length()-1)+"и";
- case DATIVE:
- return input.substring(0, input.length()-1)+"и";
- case ACCUSATIVE:
- return input.substring(0, input.length()-1)+"ю";
- case INSTRUMENTAL:
- return input.substring(0, input.length()-1)+"ей";
- case PREPOSITIONAL:
- return input.substring(0, input.length()-1)+"и";
- }
+ return input.substring(0, input.length()-1)+switch(_case){
+ case GENITIVE, PREPOSITIONAL, DATIVE -> "и";
+ case ACCUSATIVE -> "ю";
+ case INSTRUMENTAL -> "ей";
+ default -> throw new IllegalArgumentException();
+ };
}
if(inputLower.endsWith("иа") || inputLower.endsWith("аа") || inputLower.endsWith("оа") || inputLower.endsWith("уа") || inputLower.endsWith("ыа") || inputLower.endsWith("еа") || inputLower.endsWith("юа") || inputLower.endsWith("эа")){
return input;
@@ -188,446 +125,289 @@ public static String inflectLastName(String input, User.Gender gender, Inflector
return input;
}
if(gender==User.Gender.FEMALE && (inputLower.endsWith("ова") || inputLower.endsWith("ева") || inputLower.endsWith("на") || inputLower.endsWith("ёва"))){
- switch(_case){
- case GENITIVE:
- return input.substring(0, input.length()-1)+"ой";
- case DATIVE:
- return input.substring(0, input.length()-1)+"ой";
- case ACCUSATIVE:
- return input.substring(0, input.length()-1)+"у";
- case INSTRUMENTAL:
- return input.substring(0, input.length()-1)+"ой";
- case PREPOSITIONAL:
- return input.substring(0, input.length()-1)+"ой";
- }
+ return input.substring(0, input.length()-1)+switch(_case){
+ case GENITIVE, PREPOSITIONAL, INSTRUMENTAL, DATIVE -> "ой";
+ case ACCUSATIVE -> "у";
+ default -> throw new IllegalArgumentException();
+ };
}
if(inputLower.endsWith("га") || inputLower.endsWith("ка") || inputLower.endsWith("ха") || inputLower.endsWith("ча") || inputLower.endsWith("ща") || inputLower.endsWith("жа") || inputLower.endsWith("ша")){
- switch(_case){
- case GENITIVE:
- return input.substring(0, input.length()-1)+"и";
- case DATIVE:
- return input.substring(0, input.length()-1)+"е";
- case ACCUSATIVE:
- return input.substring(0, input.length()-1)+"у";
- case INSTRUMENTAL:
- return input.substring(0, input.length()-1)+"ой";
- case PREPOSITIONAL:
- return input.substring(0, input.length()-1)+"е";
- }
+ return input.substring(0, input.length()-1)+switch(_case){
+ case GENITIVE -> "и";
+ case DATIVE, PREPOSITIONAL -> "е";
+ case ACCUSATIVE -> "у";
+ case INSTRUMENTAL -> "ой";
+ default -> throw new IllegalArgumentException();
+ };
}
if(inputLower.endsWith("а")){
- switch(_case){
- case GENITIVE:
- return input.substring(0, input.length()-1)+"ы";
- case DATIVE:
- return input.substring(0, input.length()-1)+"е";
- case ACCUSATIVE:
- return input.substring(0, input.length()-1)+"у";
- case INSTRUMENTAL:
- return input.substring(0, input.length()-1)+"ой";
- case PREPOSITIONAL:
- return input.substring(0, input.length()-1)+"е";
- }
+ return input.substring(0, input.length()-1)+switch(_case){
+ case GENITIVE -> "ы";
+ case DATIVE, PREPOSITIONAL -> "е";
+ case ACCUSATIVE -> "у";
+ case INSTRUMENTAL -> "ой";
+ default -> throw new IllegalArgumentException();
+ };
}
if(gender==User.Gender.MALE && (inputLower.endsWith("ь"))){
- switch(_case){
- case GENITIVE:
- return input.substring(0, input.length()-1)+"я";
- case DATIVE:
- return input.substring(0, input.length()-1)+"ю";
- case ACCUSATIVE:
- return input.substring(0, input.length()-1)+"я";
- case INSTRUMENTAL:
- return input.substring(0, input.length()-1)+"ем";
- case PREPOSITIONAL:
- return input.substring(0, input.length()-1)+"е";
- }
+ return input.substring(0, input.length()-1)+switch(_case){
+ case GENITIVE, ACCUSATIVE -> "я";
+ case DATIVE -> "ю";
+ case INSTRUMENTAL -> "ем";
+ case PREPOSITIONAL -> "е";
+ default -> throw new IllegalArgumentException();
+ };
}
if(inputLower.endsWith("я")){
- switch(_case){
- case GENITIVE:
- return input.substring(0, input.length()-1)+"и";
- case DATIVE:
- return input.substring(0, input.length()-1)+"е";
- case ACCUSATIVE:
- return input.substring(0, input.length()-1)+"ю";
- case INSTRUMENTAL:
- return input.substring(0, input.length()-1)+"ей";
- case PREPOSITIONAL:
- return input.substring(0, input.length()-1)+"е";
- }
+ return input.substring(0, input.length()-1)+switch(_case){
+ case GENITIVE -> "и";
+ case DATIVE, PREPOSITIONAL -> "е";
+ case ACCUSATIVE -> "ю";
+ case INSTRUMENTAL -> "ей";
+ default -> throw new IllegalArgumentException();
+ };
}
if(gender==User.Gender.MALE && (inputLower.endsWith("обей"))){
- switch(_case){
- case GENITIVE:
- return input.substring(0, input.length()-2)+"ья";
- case DATIVE:
- return input.substring(0, input.length()-2)+"ью";
- case ACCUSATIVE:
- return input.substring(0, input.length()-2)+"ья";
- case INSTRUMENTAL:
- return input.substring(0, input.length()-2)+"ьем";
- case PREPOSITIONAL:
- return input.substring(0, input.length()-2)+"ье";
- }
+ return input.substring(0, input.length()-2)+switch(_case){
+ case GENITIVE, ACCUSATIVE -> "ья";
+ case DATIVE -> "ью";
+ case INSTRUMENTAL -> "ьем";
+ case PREPOSITIONAL -> "ье";
+ default -> throw new IllegalArgumentException();
+ };
}
if(gender==User.Gender.MALE && (inputLower.endsWith("ей"))){
- switch(_case){
- case GENITIVE:
- return input.substring(0, input.length()-1)+"я";
- case DATIVE:
- return input.substring(0, input.length()-1)+"ю";
- case ACCUSATIVE:
- return input.substring(0, input.length()-1)+"я";
- case INSTRUMENTAL:
- return input.substring(0, input.length()-1)+"ем";
- case PREPOSITIONAL:
- return input.substring(0, input.length()-1)+"е";
- }
+ return input.substring(0, input.length()-1)+switch(_case){
+ case GENITIVE, ACCUSATIVE -> "я";
+ case DATIVE -> "ю";
+ case INSTRUMENTAL -> "ем";
+ case PREPOSITIONAL -> "е";
+ default -> throw new IllegalArgumentException();
+ };
}
if(gender==User.Gender.MALE && (inputLower.endsWith("ян") || inputLower.endsWith("ан") || inputLower.endsWith("йн"))){
- switch(_case){
- case GENITIVE:
- return input+"а";
- case DATIVE:
- return input+"у";
- case ACCUSATIVE:
- return input+"а";
- case INSTRUMENTAL:
- return input+"ом";
- case PREPOSITIONAL:
- return input+"е";
- }
+ return input+switch(_case){
+ case GENITIVE, ACCUSATIVE -> "а";
+ case DATIVE -> "у";
+ case INSTRUMENTAL -> "ом";
+ case PREPOSITIONAL -> "е";
+ default -> throw new IllegalArgumentException();
+ };
}
if(gender==User.Gender.MALE && (inputLower.endsWith("ынец"))){
- switch(_case){
- case GENITIVE:
- return input.substring(0, input.length()-2)+"ца";
- case DATIVE:
- return input.substring(0, input.length()-2)+"цу";
- case ACCUSATIVE:
- return input.substring(0, input.length()-2)+"ца";
- case INSTRUMENTAL:
- return input.substring(0, input.length()-2)+"цом";
- case PREPOSITIONAL:
- return input.substring(0, input.length()-2)+"це";
- }
- }
- if(gender==User.Gender.MALE && (inputLower.endsWith("нец") || inputLower.endsWith("робец"))){
- switch(_case){
- case GENITIVE:
- return input.substring(0, input.length()-2)+"ца";
- case DATIVE:
- return input.substring(0, input.length()-2)+"цу";
- case ACCUSATIVE:
- return input.substring(0, input.length()-2)+"ца";
- case INSTRUMENTAL:
- return input.substring(0, input.length()-2)+"цем";
- case PREPOSITIONAL:
- return input.substring(0, input.length()-2)+"це";
- }
+ return input.substring(0, input.length()-2)+switch(_case){
+ case GENITIVE, ACCUSATIVE -> "ца";
+ case DATIVE -> "цу";
+ case INSTRUMENTAL -> "цом";
+ case PREPOSITIONAL -> "це";
+ default -> throw new IllegalArgumentException();
+ };
+ }
+ if(gender==User.Gender.MALE && (inputLower.endsWith("нец") || inputLower.endsWith("мец") || inputLower.endsWith("робец"))){
+ return input.substring(0, input.length()-2)+switch(_case){
+ case GENITIVE, ACCUSATIVE -> "ца";
+ case DATIVE -> "цу";
+ case INSTRUMENTAL -> "цем";
+ case PREPOSITIONAL -> "це";
+ default -> throw new IllegalArgumentException();
+ };
}
if(gender==User.Gender.MALE && (inputLower.endsWith("ай"))){
- switch(_case){
- case GENITIVE:
- return input.substring(0, input.length()-1)+"я";
- case DATIVE:
- return input.substring(0, input.length()-1)+"ю";
- case ACCUSATIVE:
- return input.substring(0, input.length()-1)+"я";
- case INSTRUMENTAL:
- return input.substring(0, input.length()-1)+"ем";
- case PREPOSITIONAL:
- return input.substring(0, input.length()-1)+"е";
- }
+ return input.substring(0, input.length()-1)+switch(_case){
+ case GENITIVE, ACCUSATIVE -> "я";
+ case DATIVE -> "ю";
+ case INSTRUMENTAL -> "ем";
+ case PREPOSITIONAL -> "е";
+ default -> throw new IllegalArgumentException();
+ };
}
if(gender==User.Gender.MALE && (inputLower.endsWith("гой") || inputLower.endsWith("кой"))){
- switch(_case){
- case GENITIVE:
- return input.substring(0, input.length()-1)+"го";
- case DATIVE:
- return input.substring(0, input.length()-1)+"му";
- case ACCUSATIVE:
- return input.substring(0, input.length()-1)+"го";
- case INSTRUMENTAL:
- return input.substring(0, input.length()-2)+"им";
- case PREPOSITIONAL:
- return input.substring(0, input.length()-1)+"м";
- }
+ return switch(_case){
+ case GENITIVE, ACCUSATIVE -> input.substring(0, input.length()-1)+"го";
+ case DATIVE -> input.substring(0, input.length()-1)+"му";
+ case INSTRUMENTAL -> input.substring(0, input.length()-2)+"им";
+ case PREPOSITIONAL -> input.substring(0, input.length()-1)+"м";
+ default -> throw new IllegalArgumentException();
+ };
}
if(gender==User.Gender.MALE && (inputLower.endsWith("ой"))){
- switch(_case){
- case GENITIVE:
- return input.substring(0, input.length()-1)+"го";
- case DATIVE:
- return input.substring(0, input.length()-1)+"му";
- case ACCUSATIVE:
- return input.substring(0, input.length()-1)+"го";
- case INSTRUMENTAL:
- return input.substring(0, input.length()-2)+"ым";
- case PREPOSITIONAL:
- return input.substring(0, input.length()-1)+"м";
- }
- }
- if(gender==User.Gender.MALE && (inputLower.endsWith("ах") || inputLower.endsWith("ив") || inputLower.endsWith("шток"))){
- switch(_case){
- case GENITIVE:
- return input+"а";
- case DATIVE:
- return input+"у";
- case ACCUSATIVE:
- return input+"а";
- case INSTRUMENTAL:
- return input+"ом";
- case PREPOSITIONAL:
- return input+"е";
- }
+ return switch(_case){
+ case GENITIVE, ACCUSATIVE -> input.substring(0, input.length()-1)+"го";
+ case DATIVE -> input.substring(0, input.length()-1)+"му";
+ case INSTRUMENTAL -> input.substring(0, input.length()-2)+"ым";
+ case PREPOSITIONAL -> input.substring(0, input.length()-1)+"м";
+ default -> throw new IllegalArgumentException();
+ };
+ }
+ if(gender==User.Gender.MALE && (inputLower.endsWith("ах") || inputLower.endsWith("ав") || inputLower.endsWith("ив") || inputLower.endsWith("шток"))){
+ return input+switch(_case){
+ case GENITIVE, ACCUSATIVE -> "а";
+ case DATIVE -> "у";
+ case INSTRUMENTAL -> "ом";
+ case PREPOSITIONAL -> "е";
+ default -> throw new IllegalArgumentException();
+ };
}
if(gender==User.Gender.MALE && (inputLower.endsWith("ший") || inputLower.endsWith("щий") || inputLower.endsWith("жий") || inputLower.endsWith("ний"))){
- switch(_case){
- case GENITIVE:
- return input.substring(0, input.length()-2)+"его";
- case DATIVE:
- return input.substring(0, input.length()-2)+"ему";
- case ACCUSATIVE:
- return input.substring(0, input.length()-2)+"его";
- case INSTRUMENTAL:
- return input.substring(0, input.length()-1)+"м";
- case PREPOSITIONAL:
- return input.substring(0, input.length()-2)+"ем";
- }
+ return switch(_case){
+ case GENITIVE, ACCUSATIVE -> input.substring(0, input.length()-2)+"его";
+ case DATIVE -> input.substring(0, input.length()-2)+"ему";
+ case INSTRUMENTAL -> input.substring(0, input.length()-1)+"м";
+ case PREPOSITIONAL -> input.substring(0, input.length()-2)+"ем";
+ default -> throw new IllegalArgumentException();
+ };
}
if(gender==User.Gender.MALE && (inputLower.endsWith("ый") || inputLower.endsWith("кий") || inputLower.endsWith("хий"))){
- switch(_case){
- case GENITIVE:
- return input.substring(0, input.length()-2)+"ого";
- case DATIVE:
- return input.substring(0, input.length()-2)+"ому";
- case ACCUSATIVE:
- return input.substring(0, input.length()-2)+"ого";
- case INSTRUMENTAL:
- return input.substring(0, input.length()-1)+"м";
- case PREPOSITIONAL:
- return input.substring(0, input.length()-2)+"ом";
- }
+ return switch(_case){
+ case GENITIVE, ACCUSATIVE -> input.substring(0, input.length()-2)+"ого";
+ case DATIVE -> input.substring(0, input.length()-2)+"ому";
+ case INSTRUMENTAL -> input.substring(0, input.length()-1)+"м";
+ case PREPOSITIONAL -> input.substring(0, input.length()-2)+"ом";
+ default -> throw new IllegalArgumentException();
+ };
}
if(gender==User.Gender.MALE && (inputLower.endsWith("ий"))){
- switch(_case){
- case GENITIVE:
- return input.substring(0, input.length()-1)+"я";
- case DATIVE:
- return input.substring(0, input.length()-1)+"ю";
- case ACCUSATIVE:
- return input.substring(0, input.length()-1)+"я";
- case INSTRUMENTAL:
- return input.substring(0, input.length()-1)+"ем";
- case PREPOSITIONAL:
- return input.substring(0, input.length()-1)+"и";
- }
+ return input.substring(0, input.length()-1)+switch(_case){
+ case GENITIVE, ACCUSATIVE -> "я";
+ case DATIVE -> "ю";
+ case INSTRUMENTAL -> "ем";
+ case PREPOSITIONAL -> "и";
+ default -> throw new IllegalArgumentException();
+ };
}
if(gender==User.Gender.MALE && (inputLower.endsWith("ок"))){
- switch(_case){
- case GENITIVE:
- return input.substring(0, input.length()-2)+"ка";
- case DATIVE:
- return input.substring(0, input.length()-2)+"ку";
- case ACCUSATIVE:
- return input.substring(0, input.length()-2)+"ка";
- case INSTRUMENTAL:
- return input.substring(0, input.length()-2)+"ком";
- case PREPOSITIONAL:
- return input.substring(0, input.length()-2)+"ке";
- }
+ return input.substring(0, input.length()-2)+switch(_case){
+ case GENITIVE, ACCUSATIVE -> "ка";
+ case DATIVE -> "ку";
+ case INSTRUMENTAL -> "ком";
+ case PREPOSITIONAL -> "ке";
+ default -> throw new IllegalArgumentException();
+ };
}
if(gender==User.Gender.MALE && (inputLower.endsWith("обец") || inputLower.endsWith("швец") || inputLower.endsWith("ьвец"))){
- switch(_case){
- case GENITIVE:
- return input+"а";
- case DATIVE:
- return input+"у";
- case ACCUSATIVE:
- return input+"а";
- case INSTRUMENTAL:
- return input+"ем";
- case PREPOSITIONAL:
- return input+"е";
- }
+ return input+switch(_case){
+ case GENITIVE, ACCUSATIVE -> "а";
+ case DATIVE -> "у";
+ case INSTRUMENTAL -> "ем";
+ case PREPOSITIONAL -> "е";
+ default -> throw new IllegalArgumentException();
+ };
}
if(gender==User.Gender.MALE && (inputLower.endsWith("аец") || inputLower.endsWith("иец") || inputLower.endsWith("еец"))){
- switch(_case){
- case GENITIVE:
- return input.substring(0, input.length()-2)+"йца";
- case DATIVE:
- return input.substring(0, input.length()-2)+"йцу";
- case ACCUSATIVE:
- return input.substring(0, input.length()-2)+"йца";
- case INSTRUMENTAL:
- return input.substring(0, input.length()-2)+"йцем";
- case PREPOSITIONAL:
- return input.substring(0, input.length()-2)+"йце";
- }
+ return input.substring(0, input.length()-2)+switch(_case){
+ case GENITIVE, ACCUSATIVE -> "йца";
+ case DATIVE -> "йцу";
+ case INSTRUMENTAL -> "йцем";
+ case PREPOSITIONAL -> "йце";
+ default -> throw new IllegalArgumentException();
+ };
}
if(gender==User.Gender.MALE && (inputLower.endsWith("опец"))){
- switch(_case){
- case GENITIVE:
- return input.substring(0, input.length()-2)+"ца";
- case DATIVE:
- return input.substring(0, input.length()-2)+"цу";
- case ACCUSATIVE:
- return input.substring(0, input.length()-2)+"ца";
- case INSTRUMENTAL:
- return input.substring(0, input.length()-2)+"цем";
- case PREPOSITIONAL:
- return input.substring(0, input.length()-2)+"це";
- }
- }
- if(gender==User.Gender.MALE && (inputLower.endsWith("вец") || inputLower.endsWith("убец") || inputLower.endsWith("ырец"))){
- switch(_case){
- case GENITIVE:
- return input.substring(0, input.length()-2)+"ца";
- case DATIVE:
- return input.substring(0, input.length()-2)+"цу";
- case ACCUSATIVE:
- return input.substring(0, input.length()-2)+"ца";
- case INSTRUMENTAL:
- return input.substring(0, input.length()-2)+"цом";
- case PREPOSITIONAL:
- return input.substring(0, input.length()-2)+"це";
- }
+ return input.substring(0, input.length()-2)+switch(_case){
+ case GENITIVE, ACCUSATIVE -> "ца";
+ case DATIVE -> "цу";
+ case INSTRUMENTAL -> "цем";
+ case PREPOSITIONAL -> "це";
+ default -> throw new IllegalArgumentException();
+ };
+ }
+ if(gender==User.Gender.MALE && (inputLower.endsWith("вец") || inputLower.endsWith("сец") || inputLower.endsWith("убец") || inputLower.endsWith("ырец"))){
+ return input.substring(0, input.length()-2)+switch(_case){
+ case GENITIVE, ACCUSATIVE -> "ца";
+ case DATIVE -> "цу";
+ case INSTRUMENTAL -> "цом";
+ case PREPOSITIONAL -> "це";
+ default -> throw new IllegalArgumentException();
+ };
}
if(gender==User.Gender.MALE && (inputLower.endsWith("ц") || inputLower.endsWith("ч") || inputLower.endsWith("ш") || inputLower.endsWith("щ"))){
- switch(_case){
- case GENITIVE:
- return input+"а";
- case DATIVE:
- return input+"у";
- case ACCUSATIVE:
- return input+"а";
- case INSTRUMENTAL:
- return input+"ем";
- case PREPOSITIONAL:
- return input+"е";
- }
+ return input+switch(_case){
+ case GENITIVE, ACCUSATIVE -> "а";
+ case DATIVE -> "у";
+ case INSTRUMENTAL -> "ем";
+ case PREPOSITIONAL -> "е";
+ default -> throw new IllegalArgumentException();
+ };
}
if(gender==User.Gender.MALE && (inputLower.endsWith("ен") || inputLower.endsWith("нн") || inputLower.endsWith("он") || inputLower.endsWith("ун") || inputLower.endsWith("б") || inputLower.endsWith("г") || inputLower.endsWith("д") || inputLower.endsWith("ж") || inputLower.endsWith("з") || inputLower.endsWith("к") || inputLower.endsWith("л") || inputLower.endsWith("м") || inputLower.endsWith("п") || inputLower.endsWith("р") || inputLower.endsWith("с") || inputLower.endsWith("т") || inputLower.endsWith("ф") || inputLower.endsWith("х"))){
- switch(_case){
- case GENITIVE:
- return input+"а";
- case DATIVE:
- return input+"у";
- case ACCUSATIVE:
- return input+"а";
- case INSTRUMENTAL:
- return input+"ом";
- case PREPOSITIONAL:
- return input+"е";
- }
+ return input+switch(_case){
+ case GENITIVE, ACCUSATIVE -> "а";
+ case DATIVE -> "у";
+ case INSTRUMENTAL -> "ом";
+ case PREPOSITIONAL -> "е";
+ default -> throw new IllegalArgumentException();
+ };
}
if(gender==User.Gender.MALE && (inputLower.endsWith("в") || inputLower.endsWith("н"))){
- switch(_case){
- case GENITIVE:
- return input+"а";
- case DATIVE:
- return input+"у";
- case ACCUSATIVE:
- return input+"а";
- case INSTRUMENTAL:
- return input+"ым";
- case PREPOSITIONAL:
- return input+"е";
- }
+ return input+switch(_case){
+ case GENITIVE, ACCUSATIVE -> "а";
+ case DATIVE -> "у";
+ case INSTRUMENTAL -> "ым";
+ case PREPOSITIONAL -> "е";
+ default -> throw new IllegalArgumentException();
+ };
}
return input;
}
public static String inflectFirstName(String input, User.Gender gender, Inflector.Case _case, boolean firstWord){
+ if(_case==Inflector.Case.NOMINATIVE) return input;
String inputLower=input.toLowerCase();
if(gender==User.Gender.MALE && (inputLower.equals("лев"))){
- switch(_case){
- case GENITIVE:
- return input.substring(0, input.length()-2)+"ьва";
- case DATIVE:
- return input.substring(0, input.length()-2)+"ьву";
- case ACCUSATIVE:
- return input.substring(0, input.length()-2)+"ьва";
- case INSTRUMENTAL:
- return input.substring(0, input.length()-2)+"ьвом";
- case PREPOSITIONAL:
- return input.substring(0, input.length()-2)+"ьве";
- }
+ return input.substring(0, input.length()-2)+switch(_case){
+ case GENITIVE, ACCUSATIVE -> "ьва";
+ case DATIVE -> "ьву";
+ case INSTRUMENTAL -> "ьвом";
+ case PREPOSITIONAL -> "ьве";
+ default -> throw new IllegalArgumentException();
+ };
}
if(gender==User.Gender.MALE && (inputLower.equals("пётр"))){
- switch(_case){
- case GENITIVE:
- return input.substring(0, input.length()-3)+"етра";
- case DATIVE:
- return input.substring(0, input.length()-3)+"етру";
- case ACCUSATIVE:
- return input.substring(0, input.length()-3)+"етра";
- case INSTRUMENTAL:
- return input.substring(0, input.length()-3)+"етром";
- case PREPOSITIONAL:
- return input.substring(0, input.length()-3)+"етре";
- }
+ return input.substring(0, input.length()-3)+switch(_case){
+ case GENITIVE, ACCUSATIVE -> "етра";
+ case DATIVE -> "етру";
+ case INSTRUMENTAL -> "етром";
+ case PREPOSITIONAL -> "етре";
+ default -> throw new IllegalArgumentException();
+ };
}
if(gender==User.Gender.MALE && (inputLower.equals("павел"))){
- switch(_case){
- case GENITIVE:
- return input.substring(0, input.length()-2)+"ла";
- case DATIVE:
- return input.substring(0, input.length()-2)+"лу";
- case ACCUSATIVE:
- return input.substring(0, input.length()-2)+"ла";
- case INSTRUMENTAL:
- return input.substring(0, input.length()-2)+"лом";
- case PREPOSITIONAL:
- return input.substring(0, input.length()-2)+"ле";
- }
+ return input.substring(0, input.length()-2)+switch(_case){
+ case GENITIVE, ACCUSATIVE -> "ла";
+ case DATIVE -> "лу";
+ case INSTRUMENTAL -> "лом";
+ case PREPOSITIONAL -> "ле";
+ default -> throw new IllegalArgumentException();
+ };
}
if(gender==User.Gender.MALE && (inputLower.equals("яша"))){
- switch(_case){
- case GENITIVE:
- return input.substring(0, input.length()-1)+"и";
- case DATIVE:
- return input.substring(0, input.length()-1)+"е";
- case ACCUSATIVE:
- return input.substring(0, input.length()-1)+"у";
- case INSTRUMENTAL:
- return input.substring(0, input.length()-1)+"ей";
- case PREPOSITIONAL:
- return input.substring(0, input.length()-1)+"е";
- }
+ return input.substring(0, input.length()-1)+switch(_case){
+ case GENITIVE -> "и";
+ case DATIVE, PREPOSITIONAL -> "е";
+ case ACCUSATIVE -> "у";
+ case INSTRUMENTAL -> "ей";
+ default -> throw new IllegalArgumentException();
+ };
}
if(gender==User.Gender.MALE && (inputLower.equals("илья"))){
- switch(_case){
- case GENITIVE:
- return input.substring(0, input.length()-1)+"и";
- case DATIVE:
- return input.substring(0, input.length()-1)+"е";
- case ACCUSATIVE:
- return input.substring(0, input.length()-1)+"ю";
- case INSTRUMENTAL:
- return input.substring(0, input.length()-1)+"ёй";
- case PREPOSITIONAL:
- return input.substring(0, input.length()-1)+"е";
- }
+ return input.substring(0, input.length()-1)+switch(_case){
+ case GENITIVE -> "и";
+ case DATIVE, PREPOSITIONAL -> "е";
+ case ACCUSATIVE -> "ю";
+ case INSTRUMENTAL -> "ёй";
+ default -> throw new IllegalArgumentException();
+ };
}
if(gender==User.Gender.MALE && (inputLower.equals("шота"))){
return input;
}
if(gender==User.Gender.FEMALE && (inputLower.equals("агидель") || inputLower.equals("жизель") || inputLower.equals("нинель") || inputLower.equals("рашель") || inputLower.equals("рахиль"))){
- switch(_case){
- case GENITIVE:
- return input.substring(0, input.length()-1)+"и";
- case DATIVE:
- return input.substring(0, input.length()-1)+"и";
- case ACCUSATIVE:
- return input;
- case INSTRUMENTAL:
- return input+"ю";
- case PREPOSITIONAL:
- return input.substring(0, input.length()-1)+"и";
- }
+ return switch(_case){
+ case GENITIVE, PREPOSITIONAL, DATIVE -> input.substring(0, input.length()-1)+"и";
+ case ACCUSATIVE -> input;
+ case INSTRUMENTAL -> input+"ю";
+ default -> throw new IllegalArgumentException();
+ };
}
if(inputLower.endsWith("е") || inputLower.endsWith("ё") || inputLower.endsWith("и") || inputLower.endsWith("о") || inputLower.endsWith("у") || inputLower.endsWith("ы") || inputLower.endsWith("э") || inputLower.endsWith("ю")){
return input;
@@ -639,278 +419,199 @@ public static String inflectFirstName(String input, User.Gender gender, Inflecto
return input;
}
if(gender==User.Gender.FEMALE && (inputLower.endsWith("ь"))){
- switch(_case){
- case GENITIVE:
- return input.substring(0, input.length()-1)+"и";
- case DATIVE:
- return input.substring(0, input.length()-1)+"и";
- case ACCUSATIVE:
- return input;
- case INSTRUMENTAL:
- return input+"ю";
- case PREPOSITIONAL:
- return input.substring(0, input.length()-1)+"и";
- }
+ return switch(_case){
+ case GENITIVE, PREPOSITIONAL, DATIVE -> input.substring(0, input.length()-1)+"и";
+ case ACCUSATIVE -> input;
+ case INSTRUMENTAL -> input+"ю";
+ default -> throw new IllegalArgumentException();
+ };
}
if(gender==User.Gender.MALE && (inputLower.endsWith("ь"))){
- switch(_case){
- case GENITIVE:
- return input.substring(0, input.length()-1)+"я";
- case DATIVE:
- return input.substring(0, input.length()-1)+"ю";
- case ACCUSATIVE:
- return input.substring(0, input.length()-1)+"я";
- case INSTRUMENTAL:
- return input.substring(0, input.length()-1)+"ем";
- case PREPOSITIONAL:
- return input.substring(0, input.length()-1)+"е";
- }
+ return input.substring(0, input.length()-1)+switch(_case){
+ case GENITIVE, ACCUSATIVE -> "я";
+ case DATIVE -> "ю";
+ case INSTRUMENTAL -> "ем";
+ case PREPOSITIONAL -> "е";
+ default -> throw new IllegalArgumentException();
+ };
}
if(inputLower.endsWith("га") || inputLower.endsWith("ка") || inputLower.endsWith("ха") || inputLower.endsWith("ча") || inputLower.endsWith("ща") || inputLower.endsWith("жа")){
- switch(_case){
- case GENITIVE:
- return input.substring(0, input.length()-1)+"и";
- case DATIVE:
- return input.substring(0, input.length()-1)+"е";
- case ACCUSATIVE:
- return input.substring(0, input.length()-1)+"у";
- case INSTRUMENTAL:
- return input.substring(0, input.length()-1)+"ой";
- case PREPOSITIONAL:
- return input.substring(0, input.length()-1)+"е";
- }
+ return input.substring(0, input.length()-1)+switch(_case){
+ case GENITIVE -> "и";
+ case DATIVE, PREPOSITIONAL -> "е";
+ case ACCUSATIVE -> "у";
+ case INSTRUMENTAL -> "ой";
+ default -> throw new IllegalArgumentException();
+ };
}
if(gender==User.Gender.FEMALE && (inputLower.endsWith("ша"))){
- switch(_case){
- case GENITIVE:
- return input.substring(0, input.length()-1)+"и";
- case DATIVE:
- return input.substring(0, input.length()-1)+"е";
- case ACCUSATIVE:
- return input.substring(0, input.length()-1)+"у";
- case INSTRUMENTAL:
- return input.substring(0, input.length()-1)+"ей";
- case PREPOSITIONAL:
- return input.substring(0, input.length()-1)+"е";
- }
+ return input.substring(0, input.length()-1)+switch(_case){
+ case GENITIVE -> "и";
+ case DATIVE, PREPOSITIONAL -> "е";
+ case ACCUSATIVE -> "у";
+ case INSTRUMENTAL -> "ей";
+ default -> throw new IllegalArgumentException();
+ };
}
if(gender==User.Gender.MALE && (inputLower.endsWith("ша") || inputLower.endsWith("ча") || inputLower.endsWith("жа"))){
- switch(_case){
- case GENITIVE:
- return input.substring(0, input.length()-1)+"и";
- case DATIVE:
- return input.substring(0, input.length()-1)+"е";
- case ACCUSATIVE:
- return input.substring(0, input.length()-1)+"у";
- case INSTRUMENTAL:
- return input.substring(0, input.length()-1)+"ей";
- case PREPOSITIONAL:
- return input.substring(0, input.length()-1)+"е";
- }
+ return input.substring(0, input.length()-1)+switch(_case){
+ case GENITIVE -> "и";
+ case DATIVE, PREPOSITIONAL -> "е";
+ case ACCUSATIVE -> "у";
+ case INSTRUMENTAL -> "ей";
+ default -> throw new IllegalArgumentException();
+ };
}
if(inputLower.endsWith("а")){
- switch(_case){
- case GENITIVE:
- return input.substring(0, input.length()-1)+"ы";
- case DATIVE:
- return input.substring(0, input.length()-1)+"е";
- case ACCUSATIVE:
- return input.substring(0, input.length()-1)+"у";
- case INSTRUMENTAL:
- return input.substring(0, input.length()-1)+"ой";
- case PREPOSITIONAL:
- return input.substring(0, input.length()-1)+"е";
- }
+ return input.substring(0, input.length()-1)+switch(_case){
+ case GENITIVE -> "ы";
+ case DATIVE, PREPOSITIONAL -> "е";
+ case ACCUSATIVE -> "у";
+ case INSTRUMENTAL -> "ой";
+ default -> throw new IllegalArgumentException();
+ };
}
if(gender==User.Gender.FEMALE && (inputLower.endsWith("ка") || inputLower.endsWith("га") || inputLower.endsWith("ха"))){
- switch(_case){
- case GENITIVE:
- return input.substring(0, input.length()-1)+"и";
- case DATIVE:
- return input.substring(0, input.length()-1)+"е";
- case ACCUSATIVE:
- return input.substring(0, input.length()-1)+"у";
- case INSTRUMENTAL:
- return input.substring(0, input.length()-1)+"ой";
- case PREPOSITIONAL:
- return input.substring(0, input.length()-1)+"е";
- }
+ return input.substring(0, input.length()-1)+switch(_case){
+ case GENITIVE -> "и";
+ case DATIVE, PREPOSITIONAL -> "е";
+ case ACCUSATIVE -> "у";
+ case INSTRUMENTAL -> "ой";
+ default -> throw new IllegalArgumentException();
+ };
}
if(gender==User.Gender.FEMALE && (inputLower.endsWith("ца"))){
- switch(_case){
- case GENITIVE:
- return input.substring(0, input.length()-1)+"ы";
- case DATIVE:
- return input.substring(0, input.length()-1)+"е";
- case ACCUSATIVE:
- return input.substring(0, input.length()-1)+"у";
- case INSTRUMENTAL:
- return input.substring(0, input.length()-1)+"ей";
- case PREPOSITIONAL:
- return input.substring(0, input.length()-1)+"е";
- }
+ return input.substring(0, input.length()-1)+switch(_case){
+ case GENITIVE -> "ы";
+ case DATIVE, PREPOSITIONAL -> "е";
+ case ACCUSATIVE -> "у";
+ case INSTRUMENTAL -> "ей";
+ default -> throw new IllegalArgumentException();
+ };
}
if(gender==User.Gender.FEMALE && (inputLower.endsWith("а"))){
- switch(_case){
- case GENITIVE:
- return input.substring(0, input.length()-1)+"ы";
- case DATIVE:
- return input.substring(0, input.length()-1)+"е";
- case ACCUSATIVE:
- return input.substring(0, input.length()-1)+"у";
- case INSTRUMENTAL:
- return input.substring(0, input.length()-1)+"ой";
- case PREPOSITIONAL:
- return input.substring(0, input.length()-1)+"е";
- }
+ return input.substring(0, input.length()-1)+switch(_case){
+ case GENITIVE -> "ы";
+ case DATIVE, PREPOSITIONAL -> "е";
+ case ACCUSATIVE -> "у";
+ case INSTRUMENTAL -> "ой";
+ default -> throw new IllegalArgumentException();
+ };
}
if(gender==User.Gender.FEMALE && (inputLower.endsWith("ия"))){
- switch(_case){
- case GENITIVE:
- return input.substring(0, input.length()-1)+"и";
- case DATIVE:
- return input.substring(0, input.length()-1)+"и";
- case ACCUSATIVE:
- return input.substring(0, input.length()-1)+"ю";
- case INSTRUMENTAL:
- return input.substring(0, input.length()-1)+"ей";
- case PREPOSITIONAL:
- return input.substring(0, input.length()-1)+"и";
- }
+ return input.substring(0, input.length()-1)+switch(_case){
+ case GENITIVE, PREPOSITIONAL, DATIVE -> "и";
+ case ACCUSATIVE -> "ю";
+ case INSTRUMENTAL -> "ей";
+ default -> throw new IllegalArgumentException();
+ };
}
if(inputLower.endsWith("я")){
- switch(_case){
- case GENITIVE:
- return input.substring(0, input.length()-1)+"и";
- case DATIVE:
- return input.substring(0, input.length()-1)+"е";
- case ACCUSATIVE:
- return input.substring(0, input.length()-1)+"ю";
- case INSTRUMENTAL:
- return input.substring(0, input.length()-1)+"ей";
- case PREPOSITIONAL:
- return input.substring(0, input.length()-1)+"е";
- }
+ return input.substring(0, input.length()-1)+switch(_case){
+ case GENITIVE -> "и";
+ case DATIVE, PREPOSITIONAL -> "е";
+ case ACCUSATIVE -> "ю";
+ case INSTRUMENTAL -> "ей";
+ default -> throw new IllegalArgumentException();
+ };
}
if(gender==User.Gender.MALE && (inputLower.endsWith("ий"))){
- switch(_case){
- case GENITIVE:
- return input.substring(0, input.length()-1)+"я";
- case DATIVE:
- return input.substring(0, input.length()-1)+"ю";
- case ACCUSATIVE:
- return input.substring(0, input.length()-1)+"я";
- case INSTRUMENTAL:
- return input.substring(0, input.length()-1)+"ем";
- case PREPOSITIONAL:
- return input.substring(0, input.length()-1)+"и";
- }
+ return input.substring(0, input.length()-1)+switch(_case){
+ case GENITIVE, ACCUSATIVE -> "я";
+ case DATIVE -> "ю";
+ case INSTRUMENTAL -> "ем";
+ case PREPOSITIONAL -> "и";
+ default -> throw new IllegalArgumentException();
+ };
}
if(gender==User.Gender.MALE && (inputLower.endsWith("ей") || inputLower.endsWith("й"))){
- switch(_case){
- case GENITIVE:
- return input.substring(0, input.length()-1)+"я";
- case DATIVE:
- return input.substring(0, input.length()-1)+"ю";
- case ACCUSATIVE:
- return input.substring(0, input.length()-1)+"я";
- case INSTRUMENTAL:
- return input.substring(0, input.length()-1)+"ем";
- case PREPOSITIONAL:
- return input.substring(0, input.length()-1)+"е";
- }
+ return input.substring(0, input.length()-1)+switch(_case){
+ case GENITIVE, ACCUSATIVE -> "я";
+ case DATIVE -> "ю";
+ case INSTRUMENTAL -> "ем";
+ case PREPOSITIONAL -> "е";
+ default -> throw new IllegalArgumentException();
+ };
+ }
+ if(gender==User.Gender.MALE && (inputLower.endsWith("бек"))){
+ return input.substring(0, input.length()-1)+switch(_case){
+ case GENITIVE, ACCUSATIVE -> "ка";
+ case DATIVE -> "ку";
+ case INSTRUMENTAL -> "ком";
+ case PREPOSITIONAL -> "ке";
+ default -> throw new IllegalArgumentException();
+ };
+ }
+ if(gender==User.Gender.MALE && (inputLower.endsWith("ек") || inputLower.endsWith("ёк"))){
+ return input.substring(0, input.length()-2)+switch(_case){
+ case GENITIVE, ACCUSATIVE -> "ька";
+ case DATIVE -> "ьку";
+ case INSTRUMENTAL -> "ьком";
+ case PREPOSITIONAL -> "ьке";
+ default -> throw new IllegalArgumentException();
+ };
}
if(gender==User.Gender.MALE && (inputLower.endsWith("ш") || inputLower.endsWith("ж"))){
- switch(_case){
- case GENITIVE:
- return input+"а";
- case DATIVE:
- return input+"у";
- case ACCUSATIVE:
- return input+"а";
- case INSTRUMENTAL:
- return input+"ем";
- case PREPOSITIONAL:
- return input+"е";
- }
+ return input+switch(_case){
+ case GENITIVE, ACCUSATIVE -> "а";
+ case DATIVE -> "у";
+ case INSTRUMENTAL -> "ем";
+ case PREPOSITIONAL -> "е";
+ default -> throw new IllegalArgumentException();
+ };
}
if(gender==User.Gender.MALE && (inputLower.endsWith("б") || inputLower.endsWith("в") || inputLower.endsWith("г") || inputLower.endsWith("д") || inputLower.endsWith("ж") || inputLower.endsWith("з") || inputLower.endsWith("к") || inputLower.endsWith("л") || inputLower.endsWith("м") || inputLower.endsWith("н") || inputLower.endsWith("п") || inputLower.endsWith("р") || inputLower.endsWith("с") || inputLower.endsWith("т") || inputLower.endsWith("ф") || inputLower.endsWith("х") || inputLower.endsWith("ц") || inputLower.endsWith("ч"))){
- switch(_case){
- case GENITIVE:
- return input+"а";
- case DATIVE:
- return input+"у";
- case ACCUSATIVE:
- return input+"а";
- case INSTRUMENTAL:
- return input+"ом";
- case PREPOSITIONAL:
- return input+"е";
- }
+ return input+switch(_case){
+ case GENITIVE, ACCUSATIVE -> "а";
+ case DATIVE -> "у";
+ case INSTRUMENTAL -> "ом";
+ case PREPOSITIONAL -> "е";
+ default -> throw new IllegalArgumentException();
+ };
}
if(inputLower.endsWith("ния") || inputLower.endsWith("рия") || inputLower.endsWith("вия")){
- switch(_case){
- case GENITIVE:
- return input.substring(0, input.length()-1)+"и";
- case DATIVE:
- return input.substring(0, input.length()-1)+"и";
- case ACCUSATIVE:
- return input.substring(0, input.length()-1)+"ю";
- case INSTRUMENTAL:
- return input.substring(0, input.length()-1)+"ем";
- case PREPOSITIONAL:
- return input.substring(0, input.length()-1)+"ем";
- }
+ return input.substring(0, input.length()-1)+switch(_case){
+ case GENITIVE, DATIVE -> "и";
+ case ACCUSATIVE -> "ю";
+ case INSTRUMENTAL, PREPOSITIONAL -> "ем";
+ default -> throw new IllegalArgumentException();
+ };
}
return input;
}
public static String inflectMiddleName(String input, User.Gender gender, Inflector.Case _case, boolean firstWord){
+ if(_case==Inflector.Case.NOMINATIVE) return input;
String inputLower=input.toLowerCase();
if(firstWord && (inputLower.equals("борух"))){
return input;
}
if(gender==User.Gender.MALE && (inputLower.endsWith("мич") || inputLower.endsWith("ьич") || inputLower.endsWith("кич"))){
- switch(_case){
- case GENITIVE:
- return input+"а";
- case DATIVE:
- return input+"у";
- case ACCUSATIVE:
- return input+"а";
- case INSTRUMENTAL:
- return input+"ом";
- case PREPOSITIONAL:
- return input+"е";
- }
+ return input+switch(_case){
+ case GENITIVE, ACCUSATIVE -> "а";
+ case DATIVE -> "у";
+ case INSTRUMENTAL -> "ом";
+ case PREPOSITIONAL -> "е";
+ default -> throw new IllegalArgumentException();
+ };
}
if(gender==User.Gender.MALE && (inputLower.endsWith("ич"))){
- switch(_case){
- case GENITIVE:
- return input+"а";
- case DATIVE:
- return input+"у";
- case ACCUSATIVE:
- return input+"а";
- case INSTRUMENTAL:
- return input+"ем";
- case PREPOSITIONAL:
- return input+"е";
- }
+ return input+switch(_case){
+ case GENITIVE, ACCUSATIVE -> "а";
+ case DATIVE -> "у";
+ case INSTRUMENTAL -> "ем";
+ case PREPOSITIONAL -> "е";
+ default -> throw new IllegalArgumentException();
+ };
}
if(gender==User.Gender.FEMALE && (inputLower.endsWith("на"))){
- switch(_case){
- case GENITIVE:
- return input.substring(0, input.length()-1)+"ы";
- case DATIVE:
- return input.substring(0, input.length()-1)+"е";
- case ACCUSATIVE:
- return input.substring(0, input.length()-1)+"у";
- case INSTRUMENTAL:
- return input.substring(0, input.length()-1)+"ой";
- case PREPOSITIONAL:
- return input.substring(0, input.length()-1)+"е";
- }
+ return input.substring(0, input.length()-1)+switch(_case){
+ case GENITIVE -> "ы";
+ case DATIVE, PREPOSITIONAL -> "е";
+ case ACCUSATIVE -> "у";
+ case INSTRUMENTAL -> "ой";
+ default -> throw new IllegalArgumentException();
+ };
}
return input;
}
@@ -931,10 +632,10 @@ public static User.Gender genderForLastName(String input){
public static User.Gender genderForFirstName(String input){
input=input.toLowerCase();
- if(input.equals("сева") || input.equals("иона") || input.equals("муса") || input.equals("саша") || input.equals("алвард") || input.equals("валери") || input.equals("кири") || input.equals("анри") || input.equals("ким") || input.equals("райхон") || input.equals("закия") || input.equals("захария") || input.equals("женя"))
+ if(input.equals("сева") || input.equals("иона") || input.equals("муса") || input.equals("саша") || input.equals("алвард") || input.equals("валери") || input.equals("кири") || input.equals("анри") || input.equals("ким") || input.equals("райхон") || input.equals("закия") || input.equals("захария") || input.equals("женя") || input.equals("карен"))
return User.Gender.UNKNOWN;
- if(input.equals("абиба") || input.equals("савва") || input.equals("лёва") || input.equals("вова") || input.equals("ага") || input.equals("ахмедага") || input.equals("алиага") || input.equals("амирага") || input.equals("агга") || input.equals("серега") || input.equals("фейга") || input.equals("гога") || input.equals("алиада") || input.equals("муктада") || input.equals("абида") || input.equals("алда") || input.equals("маджуда") || input.equals("нурлыхуда") || input.equals("гиа") || input.equals("элиа") || input.equals("гарсиа") || input.equals("вавила") || input.equals("гавриила") || input.equals("генка") || input.equals("лука") || input.equals("дима") || input.equals("зосима") || input.equals("тима") || input.equals("фима") || input.equals("фома") || input.equals("кузьма") || input.equals("жора") || input.equals("миша") || input.equals("ермила") || input.equals("данила") || input.equals("гаврила") || input.equals("абдалла") || input.equals("аталла") || input.equals("абдилла") || input.equals("атилла") || input.equals("кайролла") || input.equals("абулла") || input.equals("абула") || input.equals("свитлана") || input.equals("бена") || input.equals("гена") || input.equals("агелина") || input.equals("джанна") || input.equals("кришна") || input.equals("степа") || input.equals("дра") || input.equals("назера") || input.equals("валера") || input.equals("эстера") || input.equals("двойра") || input.equals("калистра") || input.equals("заратустра") || input.equals("юра") || input.equals("иса") || input.equals("аиса") || input.equals("халиса") || input.equals("холиса") || input.equals("валенса") || input.equals("мусса") || input.equals("ата") || input.equals("паата") || input.equals("алета") || input.equals("никита") || input.equals("мота") || input.equals("шота") || input.equals("фаста") || input.equals("коста") || input.equals("маритта") || input.equals("малюта") || input.equals("васюта") || input.equals("вафа") || input.equals("мустафа") || input.equals("ганифа") || input.equals("лев") || input.equals("яков") || input.equals("шелли") || input.equals("константин") || input.equals("марсель") || input.equals("рамиль") || input.equals("эмиль") || input.equals("бактыгуль") || input.equals("даниэль") || input.equals("игорь") || input.equals("рауль") || input.equals("поль") || input.equals("анхель") || input.equals("михель") || input.equals("мигель") || input.equals("микель") || input.equals("микаиль") || input.equals("микаель") || input.equals("михаэль") || input.equals("самаэль") || input.equals("лазарь") || input.equals("алесь") || input.equals("олесь") || input.equals("шамиль") || input.equals("рафаэль") || input.equals("джамаль") || input.equals("арминэ") || input.equals("изя") || input.equals("кузя") || input.equals("гия") || input.equals("мазия") || input.equals("кирикия") || input.equals("ркия") || input.equals("еркия") || input.equals("эркия") || input.equals("гулия") || input.equals("аксания") || input.equals("закария") || input.equals("зекерия") || input.equals("гарсия") || input.equals("шендля") || input.equals("филя") || input.equals("вилля") || input.equals("толя") || input.equals("ваня") || input.equals("саня") || input.equals("загиря") || input.equals("боря") || input.equals("цайся") || input.equals("вася") || input.equals("ося") || input.equals("петя") || input.equals("витя") || input.equals("митя") || input.equals("костя") || input.equals("алья") || input.equals("илья") || input.equals("ларья"))
+ if(input.equals("абиба") || input.equals("савва") || input.equals("лёва") || input.equals("вова") || input.equals("ага") || input.equals("ахмедага") || input.equals("алиага") || input.equals("амирага") || input.equals("агга") || input.equals("серега") || input.equals("фейга") || input.equals("гога") || input.equals("алиада") || input.equals("муктада") || input.equals("абида") || input.equals("алда") || input.equals("маджуда") || input.equals("нурлыхуда") || input.equals("гиа") || input.equals("элиа") || input.equals("гарсиа") || input.equals("вавила") || input.equals("гавриила") || input.equals("генка") || input.equals("лука") || input.equals("дима") || input.equals("зосима") || input.equals("тима") || input.equals("фима") || input.equals("фома") || input.equals("кузьма") || input.equals("жора") || input.equals("миша") || input.equals("ермила") || input.equals("данила") || input.equals("гаврила") || input.equals("абдалла") || input.equals("аталла") || input.equals("абдилла") || input.equals("атилла") || input.equals("кайролла") || input.equals("абулла") || input.equals("абула") || input.equals("свитлана") || input.equals("бена") || input.equals("гена") || input.equals("агелина") || input.equals("джанна") || input.equals("кришна") || input.equals("степа") || input.equals("дра") || input.equals("назера") || input.equals("валера") || input.equals("эстера") || input.equals("двойра") || input.equals("калистра") || input.equals("заратустра") || input.equals("юра") || input.equals("иса") || input.equals("аиса") || input.equals("халиса") || input.equals("холиса") || input.equals("валенса") || input.equals("мусса") || input.equals("ата") || input.equals("паата") || input.equals("алета") || input.equals("никита") || input.equals("мота") || input.equals("шота") || input.equals("фаста") || input.equals("коста") || input.equals("маритта") || input.equals("малюта") || input.equals("васюта") || input.equals("вафа") || input.equals("мустафа") || input.equals("ганифа") || input.equals("лев") || input.equals("яков") || input.equals("шелли") || input.equals("константин") || input.equals("марсель") || input.equals("рамиль") || input.equals("эмиль") || input.equals("бактыгуль") || input.equals("даниэль") || input.equals("игорь") || input.equals("рауль") || input.equals("поль") || input.equals("анхель") || input.equals("михель") || input.equals("мигель") || input.equals("микель") || input.equals("микаиль") || input.equals("микаель") || input.equals("михаэль") || input.equals("самаэль") || input.equals("лазарь") || input.equals("алесь") || input.equals("олесь") || input.equals("шамиль") || input.equals("рафаэль") || input.equals("джамаль") || input.equals("арминэ") || input.equals("изя") || input.equals("кузя") || input.equals("гия") || input.equals("мазия") || input.equals("кирикия") || input.equals("ркия") || input.equals("еркия") || input.equals("эркия") || input.equals("гулия") || input.equals("аксания") || input.equals("закария") || input.equals("зекерия") || input.equals("гарсия") || input.equals("шендля") || input.equals("филя") || input.equals("вилля") || input.equals("толя") || input.equals("ваня") || input.equals("саня") || input.equals("загиря") || input.equals("боря") || input.equals("цайся") || input.equals("вася") || input.equals("ося") || input.equals("петя") || input.equals("витя") || input.equals("митя") || input.equals("костя") || input.equals("алья") || input.equals("илья") || input.equals("ларья") || input.equals("артём"))
return User.Gender.MALE;
if(input.equals("судаба") || input.equals("сураба") || input.equals("любава") || input.equals("джанлука") || input.equals("варвара") || input.equals("наташа") || input.equals("зайнаб") || input.equals("любов") || input.equals("сольвейг") || input.equals("шакед") || input.equals("аннаид") || input.equals("ингрид") || input.equals("синди") || input.equals("аллаберди") || input.equals("сандали") || input.equals("лали") || input.equals("натали") || input.equals("гулькай") || input.equals("алтынай") || input.equals("гюнай") || input.equals("гюльчитай") || input.equals("нурангиз") || input.equals("лиз") || input.equals("элиз") || input.equals("ботагоз") || input.equals("юлдуз") || input.equals("диляфруз") || input.equals("габи") || input.equals("сажи") || input.equals("фанни") || input.equals("мери") || input.equals("элдари") || input.equals("эльдари") || input.equals("хилари") || input.equals("хиллари") || input.equals("аннемари") || input.equals("розмари") || input.equals("товсари") || input.equals("ансари") || input.equals("одри") || input.equals("тери") || input.equals("ири") || input.equals("катри") || input.equals("мэри") || input.equals("сатаней") || input.equals("ефтений") || input.equals("верунчик") || input.equals("гюзел") || input.equals("этел") || input.equals("рэйчел") || input.equals("джил") || input.equals("мерил") || input.equals("нинелл") || input.equals("бурул") || input.equals("ахлам") || input.equals("майрам") || input.equals("махаррам") || input.equals("мириам") || input.equals("дилярам") || input.equals("асем") || input.equals("мерьем") || input.equals("мирьем") || input.equals("эркаим") || input.equals("гулаим") || input.equals("айгерим") || input.equals("марьям") || input.equals("мирьям") || input.equals("эван") || input.equals("гульжиган") || input.equals("айдан") || input.equals("айжан") || input.equals("вивиан") || input.equals("гульжиан") || input.equals("лилиан") || input.equals("мариан") || input.equals("саиман") || input.equals("джоан") || input.equals("чулпан") || input.equals("лоран") || input.equals("моран") || input.equals("джохан") || input.equals("гульшан") || input.equals("аделин") || input.equals("жаклин") || input.equals("карин") || input.equals("каролин") || input.equals("каталин") || input.equals("катрин") || input.equals("керстин") || input.equals("кэтрин") || input.equals("мэрилин") || input.equals("рузалин") || input.equals("хелин") || input.equals("цеткин") || input.equals("ширин") || input.equals("элисон") || input.equals("дурсун") || input.equals("кристин") || input.equals("гульжиян") || input.equals("марьян") || input.equals("ренато") || input.equals("зейнеп") || input.equals("санабар") || input.equals("дильбар") || input.equals("гулизар") || input.equals("гульзар") || input.equals("пилар") || input.equals("дагмар") || input.equals("элинар") || input.equals("нилуфар") || input.equals("анхар") || input.equals("гаухар") || input.equals("естер") || input.equals("эстер") || input.equals("дженнифер") || input.equals("линор") || input.equals("элинор") || input.equals("элеонор") || input.equals("айнур") || input.equals("гульнур") || input.equals("шамсинур") || input.equals("элнур") || input.equals("ильсияр") || input.equals("нигяр") || input.equals("сигитас") || input.equals("агнес") || input.equals("анес") || input.equals("долорес") || input.equals("инес") || input.equals("анаис") || input.equals("таис") || input.equals("эллис") || input.equals("элис") || input.equals("кларис") || input.equals("амнерис") || input.equals("айрис") || input.equals("дорис") || input.equals("беатрис") || input.equals("грейс") || input.equals("грэйс") || input.equals("ботагос") || input.equals("маргос") || input.equals("джулианс") || input.equals("арус") || input.equals("диляфрус") || input.equals("саодат") || input.equals("зулхижат") || input.equals("хамат") || input.equals("патимат") || input.equals("хатимат") || input.equals("альжанат") || input.equals("маймунат") || input.equals("гульшат") || input.equals("биргит") || input.equals("рут") || input.equals("иргаш") || input.equals("айнаш") || input.equals("агнеш") || input.equals("зауреш") || input.equals("тэрбиш") || input.equals("ануш") || input.equals("азгануш") || input.equals("гаруш") || input.equals("николь") || input.equals("адась") || input.equals("любовь") || input.equals("руфь") || input.equals("ассоль") || input.equals("юдифь") || input.equals("гретель") || input.equals("греттель") || input.equals("адель") || input.equals("жизель") || input.equals("гузель") || input.equals("нинель") || input.equals("этель") || input.equals("асель") || input.equals("агарь") || input.equals("рахиль") || input.equals("фамарь") || input.equals("иаиль") || input.equals("есфирь") || input.equals("астинь") || input.equals("рапунцель") || input.equals("афиля") || input.equals("тафиля") || input.equals("фаня") || input.equals("аня"))
@@ -943,7 +644,7 @@ public static User.Gender genderForFirstName(String input){
if(input.endsWith("улла"))
return User.Gender.UNKNOWN;
- if(input.endsWith("аба") || input.endsWith("б") || input.endsWith("ав") || input.endsWith("ев") || input.endsWith("ов") || input.endsWith("г") || input.endsWith("д") || input.endsWith("ж") || input.endsWith("з") || input.endsWith("би") || input.endsWith("ди") || input.endsWith("жи") || input.endsWith("али") || input.endsWith("ри") || input.endsWith("ай") || input.endsWith("ей") || input.endsWith("ий") || input.endsWith("ой") || input.endsWith("ый") || input.endsWith("к") || input.endsWith("л") || input.endsWith("ам") || input.endsWith("ем") || input.endsWith("им") || input.endsWith("ом") || input.endsWith("ум") || input.endsWith("ым") || input.endsWith("ям") || input.endsWith("ан") || input.endsWith("бен") || input.endsWith("вен") || input.endsWith("ген") || input.endsWith("ден") || input.endsWith("ин") || input.endsWith("сейн") || input.endsWith("он") || input.endsWith("ун") || input.endsWith("ян") || input.endsWith("ио") || input.endsWith("ло") || input.endsWith("ро") || input.endsWith("то") || input.endsWith("шо") || input.endsWith("п") || input.endsWith("ар") || input.endsWith("др") || input.endsWith("ер") || input.endsWith("ир") || input.endsWith("ор") || input.endsWith("тр") || input.endsWith("ур") || input.endsWith("ыр") || input.endsWith("яр") || input.endsWith("ас") || input.endsWith("ес") || input.endsWith("ис") || input.endsWith("йс") || input.endsWith("кс") || input.endsWith("мс") || input.endsWith("ос") || input.endsWith("нс") || input.endsWith("рс") || input.endsWith("ус") || input.endsWith("юс") || input.endsWith("яс") || input.endsWith("ат") || input.endsWith("мет") || input.endsWith("кт") || input.endsWith("нт") || input.endsWith("рт") || input.endsWith("ст") || input.endsWith("ут") || input.endsWith("ф") || input.endsWith("х") || input.endsWith("ш") || input.endsWith("ы") || input.endsWith("сь") || input.endsWith("емеля") || input.endsWith("коля"))
+ if(input.endsWith("аба") || input.endsWith("б") || input.endsWith("ав") || input.endsWith("ев") || input.endsWith("ов") || input.endsWith("г") || input.endsWith("д") || input.endsWith("ж") || input.endsWith("з") || input.endsWith("би") || input.endsWith("ди") || input.endsWith("жи") || input.endsWith("али") || input.endsWith("ри") || input.endsWith("ай") || input.endsWith("ей") || input.endsWith("ий") || input.endsWith("ой") || input.endsWith("ый") || input.endsWith("к") || input.endsWith("л") || input.endsWith("ам") || input.endsWith("ем") || input.endsWith("им") || input.endsWith("ом") || input.endsWith("ум") || input.endsWith("ым") || input.endsWith("ям") || input.endsWith("ан") || input.endsWith("ен") || input.endsWith("ин") || input.endsWith("сейн") || input.endsWith("он") || input.endsWith("ун") || input.endsWith("ян") || input.endsWith("ио") || input.endsWith("ло") || input.endsWith("ро") || input.endsWith("то") || input.endsWith("шо") || input.endsWith("п") || input.endsWith("ар") || input.endsWith("др") || input.endsWith("ер") || input.endsWith("ир") || input.endsWith("ор") || input.endsWith("тр") || input.endsWith("ур") || input.endsWith("ыр") || input.endsWith("яр") || input.endsWith("ас") || input.endsWith("ес") || input.endsWith("ис") || input.endsWith("йс") || input.endsWith("кс") || input.endsWith("мс") || input.endsWith("ос") || input.endsWith("нс") || input.endsWith("рс") || input.endsWith("ус") || input.endsWith("юс") || input.endsWith("яс") || input.endsWith("ат") || input.endsWith("мет") || input.endsWith("кт") || input.endsWith("нт") || input.endsWith("рт") || input.endsWith("ст") || input.endsWith("ут") || input.endsWith("ф") || input.endsWith("х") || input.endsWith("ш") || input.endsWith("ы") || input.endsWith("сь") || input.endsWith("емеля") || input.endsWith("коля"))
return User.Gender.MALE;
if(input.endsWith("иба") || input.endsWith("люба") || input.endsWith("лава") || input.endsWith("ева") || input.endsWith("га") || input.endsWith("да") || input.endsWith("еа") || input.endsWith("иза") || input.endsWith("иа") || input.endsWith("ика") || input.endsWith("нка") || input.endsWith("ска") || input.endsWith("ела") || input.endsWith("ила") || input.endsWith("лла") || input.endsWith("эла") || input.endsWith("има") || input.endsWith("на") || input.endsWith("ра") || input.endsWith("са") || input.endsWith("та") || input.endsWith("фа") || input.endsWith("елли") || input.endsWith("еса") || input.endsWith("сса") || input.endsWith("гуль") || input.endsWith("нуэль") || input.endsWith("гюль") || input.endsWith("нэ") || input.endsWith("ая") || input.endsWith("ея") || input.endsWith("ия") || input.endsWith("йя") || input.endsWith("ля") || input.endsWith("мя") || input.endsWith("оя") || input.endsWith("ря") || input.endsWith("ся") || input.endsWith("вья") || input.endsWith("лья") || input.endsWith("мья") || input.endsWith("нья") || input.endsWith("рья") || input.endsWith("сья") || input.endsWith("тья") || input.endsWith("фья") || input.endsWith("зя"))
diff --git a/src/main/java/smithereen/lang/formatting/SubstitutionFormatterNode.java b/src/main/java/smithereen/lang/formatting/SubstitutionFormatterNode.java
index fa33d543..87bc5703 100644
--- a/src/main/java/smithereen/lang/formatting/SubstitutionFormatterNode.java
+++ b/src/main/java/smithereen/lang/formatting/SubstitutionFormatterNode.java
@@ -1,5 +1,7 @@
package smithereen.lang.formatting;
+import com.mitchellbosecke.pebble.extension.escaper.SafeString;
+
import org.unbescape.html.HtmlEscape;
import java.util.Map;
@@ -16,10 +18,15 @@ public SubstitutionFormatterNode(String id){
@Override
public void formatInto(StringBuilder buf, Map args, Lang lang){
- if(args.containsKey(id))
- buf.append(HtmlEscape.escapeHtml4Xml(convertArgument(args.get(id))));
- else
+ if(args.containsKey(id)){
+ Object arg=args.get(id);
+ if(arg instanceof SafeString)
+ buf.append(convertArgument(arg));
+ else
+ buf.append(HtmlEscape.escapeHtml4Xml(convertArgument(arg)));
+ }else{
buf.append("{").append(id).append(" missing}");
+ }
}
@Override
diff --git a/src/main/java/smithereen/libvips/LibVips.java b/src/main/java/smithereen/libvips/LibVips.java
index 295e129f..c415049e 100644
--- a/src/main/java/smithereen/libvips/LibVips.java
+++ b/src/main/java/smithereen/libvips/LibVips.java
@@ -22,31 +22,51 @@ class LibVips{
vips_init("");
if(Config.DEBUG)
vips_leak_set(true);
+
+ varArgsWrapper=Native.load(LibVipsVarArgsWrapper.class);
}
+ private static LibVipsVarArgsWrapper varArgsWrapper;
+
static native int vips_init(String argv0);
static native String vips_foreign_find_load(String filename);
static native void vips_leak_set(boolean leak);
- static native Pointer vips_image_new_from_file(String name, Pointer _null);
+ static Pointer vips_image_new_from_file(String name){
+ return varArgsWrapper.vips_image_new_from_file(name, Pointer.NULL);
+ }
static native String vips_error_buffer();
static native void vips_error_clear();
static native int vips_image_get_width(Pointer img);
static native int vips_image_get_height(Pointer img);
- static native int vips_resize(Pointer in, PointerByReference out, double scale, Pointer _null);
- static native int vips_resize(Pointer in, PointerByReference out, double scale, String _vscale, double vscale, Pointer _null);
- static native int vips_image_write_to_file(Pointer img, String fileName, Pointer _null);
+ static int vips_resize(Pointer in, PointerByReference out, double scale){
+ return varArgsWrapper.vips_resize(in, out, scale, Pointer.NULL);
+ }
+ static int vips_resize(Pointer in, PointerByReference out, double scale, double vscale){
+ return varArgsWrapper.vips_resize(in, out, scale, "vscale", vscale, Pointer.NULL);
+ }
+ static int vips_image_write_to_file(Pointer img, String fileName){
+ return varArgsWrapper.vips_image_write_to_file(img, fileName, Pointer.NULL);
+ }
static native boolean vips_image_hasalpha(Pointer img);
static native Pointer vips_array_double_new(double[] array, int n);
static native void vips_area_unref(Pointer area);
- static native int vips_flatten(Pointer in, PointerByReference out, String bgName, Pointer bgValue, Pointer _null);
- static native int vips_crop(Pointer in, PointerByReference out, int left, int top, int width, int height, Pointer _null);
+ static int vips_flatten(Pointer in, PointerByReference out, Pointer bgValue){
+ return varArgsWrapper.vips_flatten(in, out, "background", bgValue, Pointer.NULL);
+ }
+ static int vips_crop(Pointer in, PointerByReference out, int left, int top, int width, int height){
+ return varArgsWrapper.vips_crop(in, out, left, top, width, height, Pointer.NULL);
+ }
static native int vips_image_get_bands(Pointer img);
static native int vips_image_get_format(Pointer img);
- static native int vips_cast_uchar(Pointer img, PointerByReference out, Pointer _null);
+ static int vips_cast_uchar(Pointer img, PointerByReference out){
+ return varArgsWrapper.vips_cast_uchar(img, out, Pointer.NULL);
+ }
static native Pointer vips_image_get_fields(Pointer img);
static native Pointer vips_image_get_typeof(Pointer img, String name);
static native boolean vips_image_remove(Pointer img, String name);
- static native int vips_icc_transform(Pointer img, PointerByReference out, String outputProfile, Pointer _null);
+ static int vips_icc_transform(Pointer img, PointerByReference out, String outputProfile){
+ return varArgsWrapper.vips_icc_transform(img, out, outputProfile, Pointer.NULL);
+ }
static native Pointer vips_region_new(Pointer img);
static native int vips_region_prepare(Pointer region, VipsRect rect);
@@ -66,5 +86,15 @@ static class LibGLib{
static native void g_free(Pointer ptr);
static native void g_strfreev(Pointer ptr);
}
+
+ private interface LibVipsVarArgsWrapper extends Library{
+ Pointer vips_image_new_from_file(String name, Object... args);
+ int vips_resize(Pointer in, PointerByReference out, double scale, Object... args);
+ int vips_flatten(Pointer in, PointerByReference out, Object... args);
+ int vips_crop(Pointer in, PointerByReference out, int left, int top, int width, int height, Object... args);
+ int vips_image_write_to_file(Pointer img, String fileName, Object... args);
+ int vips_cast_uchar(Pointer img, PointerByReference out, Object... args);
+ int vips_icc_transform(Pointer img, PointerByReference out, String outputProfile, Object... args);
+ }
}
diff --git a/src/main/java/smithereen/libvips/VipsImage.java b/src/main/java/smithereen/libvips/VipsImage.java
index 4955c148..4c553d37 100644
--- a/src/main/java/smithereen/libvips/VipsImage.java
+++ b/src/main/java/smithereen/libvips/VipsImage.java
@@ -37,7 +37,7 @@ public VipsImage(String filePath) throws IOException{
if(loader.equals("VipsForeignLoadJpegFile")){
filePath+="[autorotate=true]";
}
- nativePtr=vips_image_new_from_file(filePath, Pointer.NULL);
+ nativePtr=vips_image_new_from_file(filePath);
if(nativePtr==Pointer.NULL){
throwError();
}
@@ -66,7 +66,7 @@ public void release(){
public VipsImage resize(double scale) throws IOException{
ensureNotReleased();
PointerByReference out=new PointerByReference();
- if(vips_resize(nativePtr, out, scale, Pointer.NULL)!=0){
+ if(vips_resize(nativePtr, out, scale)!=0){
throwError();
}
return new VipsImage(out.getValue());
@@ -75,7 +75,7 @@ public VipsImage resize(double scale) throws IOException{
public VipsImage resize(double hscale, double vscale) throws IOException{
ensureNotReleased();
PointerByReference out=new PointerByReference();
- if(vips_resize(nativePtr, out, hscale, "vscale", vscale, Pointer.NULL)!=0){
+ if(vips_resize(nativePtr, out, hscale, vscale)!=0){
throwError();
}
return new VipsImage(out.getValue());
@@ -84,7 +84,7 @@ public VipsImage resize(double hscale, double vscale) throws IOException{
public VipsImage crop(int left, int top, int width, int height) throws IOException{
ensureNotReleased();
PointerByReference out=new PointerByReference();
- if(vips_crop(nativePtr, out, left, top, width, height, Pointer.NULL)!=0){
+ if(vips_crop(nativePtr, out, left, top, width, height)!=0){
throwError();
}
return new VipsImage(out.getValue());
@@ -92,7 +92,7 @@ public VipsImage crop(int left, int top, int width, int height) throws IOExcepti
public void writeToFile(String fileName) throws IOException{
ensureNotReleased();
- if(vips_image_write_to_file(nativePtr, fileName, Pointer.NULL)!=0){
+ if(vips_image_write_to_file(nativePtr, fileName)!=0){
throwError();
}
}
@@ -107,7 +107,7 @@ public VipsImage flatten(double r, double g, double b) throws IOException{
Pointer arr=vips_array_double_new(new double[]{r, g, b}, 3);
PointerByReference out=new PointerByReference();
try{
- if(vips_flatten(nativePtr, out, "background", arr, Pointer.NULL)!=0){
+ if(vips_flatten(nativePtr, out, arr)!=0){
throwError();
}
}finally{
@@ -129,7 +129,7 @@ public BandFormat getFormat(){
public VipsImage castUChar() throws IOException{
ensureNotReleased();
PointerByReference out=new PointerByReference();
- if(vips_cast_uchar(nativePtr, out, Pointer.NULL)!=0)
+ if(vips_cast_uchar(nativePtr, out)!=0)
throwError();
return new VipsImage(out.getValue());
}
@@ -159,7 +159,7 @@ public boolean hasField(String name){
public VipsImage iccTransform(String outputProfile) throws IOException{
ensureNotReleased();
PointerByReference out=new PointerByReference();
- if(vips_icc_transform(nativePtr, out, outputProfile, Pointer.NULL)!=0)
+ if(vips_icc_transform(nativePtr, out, outputProfile)!=0)
throwError();
return new VipsImage(out.getValue());
}
diff --git a/src/main/java/smithereen/routes/ActivityPubRoutes.java b/src/main/java/smithereen/routes/ActivityPubRoutes.java
index 38e0a361..794b32a1 100644
--- a/src/main/java/smithereen/routes/ActivityPubRoutes.java
+++ b/src/main/java/smithereen/routes/ActivityPubRoutes.java
@@ -12,34 +12,24 @@
import java.io.IOException;
import java.net.URI;
import java.net.URISyntaxException;
-import java.nio.charset.StandardCharsets;
-import java.security.InvalidKeyException;
import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
-import java.security.Signature;
-import java.security.SignatureException;
import java.sql.SQLException;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Base64;
+import java.util.Collection;
import java.util.Collections;
import java.util.List;
-import java.util.Locale;
import java.util.Map;
-import java.util.TimeZone;
import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
import smithereen.BuildInfo;
import smithereen.Config;
-import smithereen.ObjectLinkResolver;
import smithereen.Utils;
import smithereen.activitypub.ActivityHandlerContext;
import smithereen.activitypub.ActivityPub;
import smithereen.activitypub.ActivityPubCache;
-import smithereen.activitypub.ActivityPubWorker;
import smithereen.activitypub.ActivityTypeHandler;
import smithereen.activitypub.DoublyNestedActivityTypeHandler;
import smithereen.activitypub.NestedActivityTypeHandler;
@@ -47,7 +37,9 @@
import smithereen.activitypub.handlers.AcceptFollowPersonHandler;
import smithereen.activitypub.handlers.AddGroupHandler;
import smithereen.activitypub.handlers.AddNoteHandler;
-import smithereen.activitypub.handlers.AddPersonHandler;
+import smithereen.activitypub.handlers.GroupAddPersonHandler;
+import smithereen.activitypub.handlers.GroupRemovePersonHandler;
+import smithereen.activitypub.handlers.PersonAddPersonHandler;
import smithereen.activitypub.handlers.AnnounceNoteHandler;
import smithereen.activitypub.handlers.CreateNoteHandler;
import smithereen.activitypub.handlers.DeleteNoteHandler;
@@ -56,6 +48,7 @@
import smithereen.activitypub.handlers.FollowPersonHandler;
import smithereen.activitypub.handlers.GroupBlockPersonHandler;
import smithereen.activitypub.handlers.GroupUndoBlockPersonHandler;
+import smithereen.activitypub.handlers.InviteGroupHandler;
import smithereen.activitypub.handlers.LeaveGroupHandler;
import smithereen.activitypub.handlers.LikeNoteHandler;
import smithereen.activitypub.handlers.OfferFollowPersonHandler;
@@ -64,14 +57,16 @@
import smithereen.activitypub.handlers.RejectAddNoteHandler;
import smithereen.activitypub.handlers.RejectFollowGroupHandler;
import smithereen.activitypub.handlers.RejectFollowPersonHandler;
+import smithereen.activitypub.handlers.RejectInviteGroupHandler;
import smithereen.activitypub.handlers.RejectOfferFollowPersonHandler;
import smithereen.activitypub.handlers.RemoveGroupHandler;
-import smithereen.activitypub.handlers.RemovePersonHandler;
+import smithereen.activitypub.handlers.PersonRemovePersonHandler;
import smithereen.activitypub.handlers.UndoAcceptFollowGroupHandler;
import smithereen.activitypub.handlers.UndoAcceptFollowPersonHandler;
import smithereen.activitypub.handlers.UndoAnnounceNoteHandler;
import smithereen.activitypub.handlers.UndoFollowGroupHandler;
import smithereen.activitypub.handlers.UndoFollowPersonHandler;
+import smithereen.activitypub.handlers.UndoInviteGroupHandler;
import smithereen.activitypub.handlers.UndoLikeNoteHandler;
import smithereen.activitypub.handlers.UpdateGroupHandler;
import smithereen.activitypub.handlers.UpdateNoteHandler;
@@ -81,6 +76,7 @@
import smithereen.activitypub.objects.ActivityPubObject;
import smithereen.activitypub.objects.Actor;
import smithereen.activitypub.objects.CollectionPage;
+import smithereen.activitypub.objects.CollectionQueryResult;
import smithereen.activitypub.objects.ForeignActor;
import smithereen.activitypub.objects.LinkOrObject;
import smithereen.activitypub.objects.ServiceActor;
@@ -92,6 +88,7 @@
import smithereen.activitypub.objects.activities.Create;
import smithereen.activitypub.objects.activities.Delete;
import smithereen.activitypub.objects.activities.Follow;
+import smithereen.activitypub.objects.activities.Invite;
import smithereen.activitypub.objects.activities.Leave;
import smithereen.activitypub.objects.activities.Like;
import smithereen.activitypub.objects.activities.Offer;
@@ -104,7 +101,7 @@
import smithereen.data.ForeignUser;
import smithereen.data.FriendshipStatus;
import smithereen.data.Group;
-import smithereen.data.ListAndTotal;
+import smithereen.data.PaginatedList;
import smithereen.data.NodeInfo;
import smithereen.data.Poll;
import smithereen.data.PollOption;
@@ -126,9 +123,10 @@
import spark.Response;
import spark.utils.StringUtils;
+import static smithereen.Utils.context;
import static smithereen.Utils.gson;
import static smithereen.Utils.parseIntOrDefault;
-import static smithereen.Utils.parseSignatureHeader;
+import static smithereen.Utils.safeParseInt;
public class ActivityPubRoutes{
@@ -157,8 +155,8 @@ public static void registerActivityHandlers(){
registerActivityHandler(ForeignUser.class, Delete.class, ForeignUser.class, new DeletePersonHandler());
registerActivityHandler(ForeignUser.class, Block.class, User.class, new PersonBlockPersonHandler());
registerActivityHandler(ForeignUser.class, Undo.class, Block.class, User.class, new PersonUndoBlockPersonHandler());
- registerActivityHandler(ForeignUser.class, Add.class, User.class, new AddPersonHandler());
- registerActivityHandler(ForeignUser.class, Remove.class, User.class, new RemovePersonHandler());
+ registerActivityHandler(ForeignUser.class, Add.class, User.class, new PersonAddPersonHandler());
+ registerActivityHandler(ForeignUser.class, Remove.class, User.class, new PersonRemovePersonHandler());
registerActivityHandler(ForeignUser.class, Add.class, Group.class, new AddGroupHandler());
registerActivityHandler(ForeignUser.class, Remove.class, Group.class, new RemoveGroupHandler());
@@ -171,6 +169,11 @@ public static void registerActivityHandlers(){
registerActivityHandler(ForeignGroup.class, Reject.class, Follow.class, ForeignGroup.class, new RejectFollowGroupHandler());
registerActivityHandler(ForeignGroup.class, Block.class, User.class, new GroupBlockPersonHandler());
registerActivityHandler(ForeignGroup.class, Undo.class, Block.class, User.class, new GroupUndoBlockPersonHandler());
+ registerActivityHandler(ForeignUser.class, Invite.class, Group.class, new InviteGroupHandler());
+ registerActivityHandler(ForeignUser.class, Reject.class, Invite.class, Group.class, new RejectInviteGroupHandler());
+ registerActivityHandler(ForeignGroup.class, Undo.class, Invite.class, ForeignGroup.class, new UndoInviteGroupHandler());
+ registerActivityHandler(ForeignGroup.class, Add.class, User.class, new GroupAddPersonHandler());
+ registerActivityHandler(ForeignGroup.class, Remove.class, User.class, new GroupRemovePersonHandler());
registerActivityHandler(Actor.class, Add.class, Post.class, new AddNoteHandler());
}
@@ -211,16 +214,12 @@ public static Object userActor(Request req, Response resp) throws SQLException{
if(username!=null){
actor=UserStorage.getByUsername(username);
if(actor==null){
- actor=GroupStorage.getByUsername(username);
+ return groupActor(req, resp);
}
}else{
actor=UserStorage.getById(Utils.parseIntOrDefault(req.params(":id"), 0));
}
- if(actor!=null && !(actor instanceof ForeignUser) && !(actor instanceof ForeignGroup)){
- if(actor instanceof Group){
- Group group=(Group) actor;
- group.adminsForActivityPub=GroupStorage.getGroupAdmins(group.id);
- }
+ if(actor!=null && !(actor instanceof ForeignUser)){
resp.type(ActivityPub.CONTENT_TYPE);
return actor;
}
@@ -235,6 +234,16 @@ public static Object groupActor(Request req, Response resp) throws SQLException{
else
group=GroupStorage.getById(Utils.parseIntOrDefault(req.params(":id"), 0));
if(group!=null && !(group instanceof ForeignGroup)){
+ if(group.accessType==Group.AccessType.PRIVATE){
+ Actor requester;
+ try{
+ requester=ActivityPub.verifyHttpSignature(req, null);
+ }catch(Exception x){
+ throw new UserActionNotAllowedException("This is a private group. Valid HTTP signature of a group member or invitee is required.", x);
+ }
+ if(!GroupStorage.areThereGroupMembersWithDomain(group.id, requester.domain) && !GroupStorage.areThereGroupInvitationsWithDomain(group.id, requester.domain))
+ throw new UserActionNotAllowedException("This is a private group and there are no "+requester.domain+" members or invitees in it.");
+ }
group.adminsForActivityPub=GroupStorage.getGroupAdmins(group.id);
resp.type(ActivityPub.CONTENT_TYPE);
return group;
@@ -245,6 +254,8 @@ public static Object groupActor(Request req, Response resp) throws SQLException{
public static Object post(Request req, Response resp) throws SQLException{
int postID=Utils.parseIntOrDefault(req.params(":postID"), 0);
Post post=PostStorage.getPostOrThrow(postID, true);
+ if(post.owner instanceof Group g)
+ ActivityPub.enforceGroupContentAccess(req, g);
resp.type(ActivityPub.CONTENT_TYPE);
return post;
}
@@ -252,6 +263,8 @@ public static Object post(Request req, Response resp) throws SQLException{
public static ActivityPubCollectionPageResponse postReplies(Request req, Response resp, int offset, int count) throws SQLException{
int postID=Utils.parseIntOrDefault(req.params(":postID"), 0);
Post post=PostStorage.getPostOrThrow(postID, true);
+ if(post.owner instanceof Group g)
+ ActivityPub.enforceGroupContentAccess(req, g);
int[] _total={0};
List ids=PostStorage.getImmediateReplyActivityPubIDs(post.getReplyKeyForReplies(), offset, count, _total);
return ActivityPubCollectionPageResponse.forLinks(ids, _total[0]);
@@ -259,7 +272,9 @@ public static ActivityPubCollectionPageResponse postReplies(Request req, Respons
public static ActivityPubCollectionPageResponse postLikes(Request req, Response resp, int offset, int count) throws SQLException{
Post post=PostStorage.getPostOrThrow(parseIntOrDefault(req.params(":postID"), 0), true);
- ListAndTotal likes=LikeStorage.getLikes(post.id, post.activityPubID, Like.ObjectType.POST, offset, count);
+ if(post.owner instanceof Group g)
+ ActivityPub.enforceGroupContentAccess(req, g);
+ PaginatedList likes=LikeStorage.getLikes(post.id, post.activityPubID, Like.ObjectType.POST, offset, count);
return ActivityPubCollectionPageResponse.forObjects(likes).ordered();
}
@@ -273,6 +288,10 @@ public static ActivityPubCollectionPageResponse pollVoters(Request req, Response
throw new ObjectNotFoundException();
if(poll.anonymous)
throw new UserActionNotAllowedException();
+ if(poll.ownerID<0){
+ Group owner=context(req).getGroupsController().getGroupOrThrow(-poll.ownerID);
+ ActivityPub.enforceGroupContentAccess(req, owner);
+ }
PollOption option=null;
for(PollOption opt:poll.options){
@@ -324,7 +343,7 @@ public static Object userOutbox(Request req, Response resp) throws SQLException{
int minID=Math.max(0, _minID);
int maxID=Math.max(0, _maxID);
int[] _total={0};
- List posts=PostStorage.getWallPosts(user.id, false, minID, maxID, 0, _total, true);
+ List posts=PostStorage.getWallPosts(user.id, false, minID, maxID, 0, 25, _total, true);
int total=_total[0];
CollectionPage page=new CollectionPage(true);
page.totalItems=total;
@@ -379,6 +398,7 @@ public static ActivityPubCollectionPageResponse groupWall(Request req, Response
Group group=GroupStorage.getById(id);
if(group==null || group instanceof ForeignGroup)
throw new ObjectNotFoundException();
+ ActivityPub.enforceGroupContentAccess(req, group);
return actorWall(req, resp, offset, count, group);
}
@@ -426,20 +446,15 @@ public static Object externalInteraction(Request req, Response resp, Account sel
return "Invalid remote object URI";
}
}
- remoteObj=ObjectLinkResolver.resolve(uri, ActivityPubObject.class, true, false, true);
- if(remoteObj==null){
- return "Error fetching remote object";
- }
+ remoteObj=context(req).getObjectLinkResolver().resolve(uri, ActivityPubObject.class, true, false, true);
if(remoteObj.activityPubID.getHost()==null || uri.getHost()==null || !remoteObj.activityPubID.getHost().equals(uri.getHost())){
return "Object ID host doesn't match URI host";
}
}catch(IOException|JsonParseException|URISyntaxException x){
return x.getMessage();
}
- if(remoteObj instanceof ForeignUser){
+ if(remoteObj instanceof ForeignUser foreignUser){
try{
- ForeignUser foreignUser=(ForeignUser) remoteObj;
-// System.out.println(foreignUser);
UserStorage.putOrUpdateForeignUser(foreignUser);
FriendshipStatus status=UserStorage.getFriendshipStatus(self.user.id, foreignUser.id);
if(status==FriendshipStatus.REQUEST_SENT){
@@ -454,24 +469,23 @@ public static Object externalInteraction(Request req, Response resp, Account sel
x.printStackTrace();
return x.toString();
}
- }else if(remoteObj instanceof ForeignGroup){
- ForeignGroup group=(ForeignGroup) remoteObj;
+ }else if(remoteObj instanceof ForeignGroup group){
+ group.storeDependencies(context(req));
GroupStorage.putOrUpdateForeignGroup(group);
resp.redirect(Config.localURI("/"+group.getFullUsername()).toString());
return "";
- }else if(remoteObj instanceof Post){
+ }else if(remoteObj instanceof Post post){
try{
- Post post=(Post) remoteObj;
Post topLevelPost;
- Utils.loadAndPreprocessRemotePostMentions(post);
+ context(req).getWallController().loadAndPreprocessRemotePostMentions(post);
if(post.inReplyTo!=null){
Post parent=PostStorage.getPostByID(post.inReplyTo);
if(parent==null){
- List thread=ActivityPubWorker.getInstance().fetchReplyThread(post).get(30, TimeUnit.SECONDS);
+ List thread=context(req).getActivityPubWorker().fetchReplyThread(post).get(30, TimeUnit.SECONDS);
topLevelPost=thread.get(0);
}else{
post.setParent(parent);
- post.storeDependencies();
+ post.storeDependencies(context(req));
PostStorage.putForeignWallPost(post);
topLevelPost=PostStorage.getPostByID(parent.getReplyChainElement(0), false);
if(topLevelPost==null)
@@ -479,10 +493,10 @@ public static Object externalInteraction(Request req, Response resp, Account sel
}
}else{
topLevelPost=post;
- post.storeDependencies();
+ post.storeDependencies(context(req));
PostStorage.putForeignWallPost(post);
}
- ActivityPubWorker.getInstance().fetchAllReplies(topLevelPost);
+ context(req).getActivityPubWorker().fetchAllReplies(topLevelPost);
resp.redirect("/posts/"+topLevelPost.id);
return "";
}catch(Exception x){
@@ -496,7 +510,6 @@ public static Object externalInteraction(Request req, Response resp, Account sel
public static Object remoteFollow(Request req, Response resp, Account self) throws SQLException{
String username=req.params(":username");
User _user=UserStorage.getByUsername(username);
-// System.out.println(_user);
if(!(_user instanceof ForeignUser)){
return Utils.wrapError(req, resp, "err_user_not_found");
}
@@ -514,7 +527,7 @@ public static Object remoteFollow(Request req, Response resp, Account self) thro
if(user.supportsFriendRequests()){
UserStorage.putFriendRequest(self.user.id, user.id, msg, false);
}else{
- UserStorage.followUser(self.user.id, user.id, false);
+ UserStorage.followUser(self.user.id, user.id, false, false);
}
Follow follow=new Follow();
follow.actor=new LinkOrObject(self.user.activityPubID);
@@ -577,6 +590,11 @@ public static Object likeObject(Request req, Response resp) throws SQLException{
Like l=LikeStorage.getByID(id);
if(l==null)
throw new ObjectNotFoundException();
+ ActivityPubObject likedObject=context(req).getObjectLinkResolver().resolve(l.object.link, ActivityPubObject.class, false, false, false);
+ if(likedObject instanceof Post post){
+ if(post.owner instanceof Group group)
+ ActivityPub.enforceGroupContentAccess(req, group);
+ }
resp.type(ActivityPub.CONTENT_TYPE);
return l;
}
@@ -588,6 +606,11 @@ public static Object undoLikeObject(Request req, Response resp) throws SQLExcept
Undo undo=ActivityPubCache.getUndoneLike(id);
if(undo==null)
throw new ObjectNotFoundException();
+ ActivityPubObject likedObject=context(req).getObjectLinkResolver().resolve(((Like)undo.object.object).object.link, ActivityPubObject.class, false, false, false);
+ if(likedObject instanceof Post post){
+ if(post.owner instanceof Group group)
+ ActivityPub.enforceGroupContentAccess(req, group);
+ }
return undo;
}
@@ -607,10 +630,10 @@ private static Object inbox(Request req, Response resp, Actor owner) throws SQLE
try{
o=ActivityPubObject.parse(obj);
}catch(Exception e){
- throw new BadRequestException("Failed to parse object: "+e.toString(), e);
+ throw new BadRequestException("Failed to parse object: "+e, e);
}
- if(o instanceof Activity)
- activity=(Activity)o;
+ if(o instanceof Activity act)
+ activity=act;
else if(o!=null)
throw new BadRequestException("Unsupported object type '"+o.getType()+"'");
else
@@ -624,19 +647,19 @@ else if(o!=null)
// special case: when users delete themselves but are not in local database, ignore that
if(activity instanceof Delete && activity.actor.link.equals(activity.object.link)){
try{
- actor=ObjectLinkResolver.resolve(activity.actor.link, Actor.class, false, false, false);
+ actor=context(req).getObjectLinkResolver().resolve(activity.actor.link, Actor.class, false, false, false);
}catch(ObjectNotFoundException x){
return "";
}
canUpdate=false;
}else{
- actor=ObjectLinkResolver.resolve(activity.actor.link, Actor.class, true, true, false);
+ actor=context(req).getObjectLinkResolver().resolve(activity.actor.link, Actor.class, true, true, false);
}
- if(!(actor instanceof ForeignActor))
+ if(!(actor instanceof ForeignActor fa))
throw new BadRequestException("Actor is local");
- if(((ForeignActor) actor).needUpdate() && canUpdate){
+ if(fa.needUpdate() && canUpdate){
try{
- actor=ObjectLinkResolver.resolve(activity.actor.link, Actor.class, true, true, true);
+ actor=context(req).getObjectLinkResolver().resolve(activity.actor.link, Actor.class, true, true, true);
}catch(ObjectNotFoundException x){
LOG.warn("Exception while refreshing remote actor", x);
}
@@ -644,10 +667,10 @@ else if(o!=null)
Actor httpSigOwner;
try{
- httpSigOwner=verifyHttpSignature(req, actor);
+ httpSigOwner=ActivityPub.verifyHttpSignature(req, actor);
}catch(Exception x){
LOG.warn("Exception while verifying HTTP signature", x);
- throw new BadRequestException(x);
+ throw new UserActionNotAllowedException(x);
}
// if the activity has an LD-signature, verify that and allow any (cached) user to sign the HTTP signature
@@ -679,11 +702,11 @@ else if(o!=null)
// parse again to make sure the actor is set everywhere
try{
ActivityPubObject _o=ActivityPubObject.parse(obj);
- if(_o instanceof Activity)
- activity=(Activity) _o;
+ if(_o instanceof Activity act1)
+ activity=act1;
}catch(Exception ignore){}
- ActivityHandlerContext context=new ActivityHandlerContext(body, hasValidLDSignature ? actor : null, httpSigOwner);
+ ActivityHandlerContext context=new ActivityHandlerContext(context(req), body, hasValidLDSignature ? actor : null, httpSigOwner);
try{
ActivityPubObject aobj;
@@ -692,7 +715,7 @@ else if(o!=null)
// special case: Mastodon sends Delete{Tombstone} for post deletions
if(aobj instanceof Tombstone){
try{
- aobj=ObjectLinkResolver.resolve(aobj.activityPubID);
+ aobj=context(req).getObjectLinkResolver().resolve(aobj.activityPubID);
}catch(ObjectNotFoundException x){
LOG.warn("Activity object not found for {}: {}", getActivityType(activity), aobj.activityPubID);
// Fail silently. We didn't have that object anyway, there's nothing to delete.
@@ -702,35 +725,39 @@ else if(o!=null)
}else{
if(activity instanceof Like || activity instanceof Delete){
try{
- aobj=ObjectLinkResolver.resolve(activity.object.link, ActivityPubObject.class, false, false, false);
+ aobj=context(req).getObjectLinkResolver().resolve(activity.object.link, ActivityPubObject.class, false, false, false);
}catch(ObjectNotFoundException x){
// Fail silently. Pleroma sends all likes to followers, including for objects they may not have.
LOG.info("Activity object not known for {}: {}", activity.getType(), activity.object.link);
return "";
}
}else{
- // special case: fetch the object of Announce{Note} or Add{...}
- aobj=ObjectLinkResolver.resolve(activity.object.link, ActivityPubObject.class, activity instanceof Announce || activity instanceof Add, false, false);
+ // special case: fetch the object of Announce{Note}, Add{...}, or Invite{Group}
+ Actor collectionOwner;
+ if(activity instanceof Add add && add.target!=null && add.target.object instanceof ActivityPubCollection target && target.attributedTo!=null){
+ collectionOwner=context(req).getObjectLinkResolver().resolve(target.attributedTo, Actor.class, false, false, false);
+ }else{
+ collectionOwner=null;
+ }
+ aobj=context(req).getObjectLinkResolver().resolve(activity.object.link, ActivityPubObject.class, activity instanceof Announce || activity instanceof Add || activity instanceof Invite, false, false, collectionOwner, true);
}
}
for(ActivityTypeHandlerRecord r : typeHandlers){
if(r.actorClass.isInstance(actor)){
if(r.activityClass.isInstance(activity)){
- if(r.nestedActivityClass!=null && aobj instanceof Activity && r.nestedActivityClass.isInstance(aobj)){
- Activity nestedActivity=(Activity)aobj;
+ if(r.nestedActivityClass!=null && aobj instanceof Activity nestedActivity && r.nestedActivityClass.isInstance(aobj)){
ActivityPubObject nestedObject;
if(nestedActivity.object.object!=null)
nestedObject=nestedActivity.object.object;
else
- nestedObject=ObjectLinkResolver.resolve(nestedActivity.object.link);
+ nestedObject=context(req).getObjectLinkResolver().resolve(nestedActivity.object.link);
- if(r.doublyNestedActivityClass!=null && nestedObject instanceof Activity && r.doublyNestedActivityClass.isInstance(nestedObject)){
- Activity doublyNestedActivity=(Activity)nestedObject;
+ if(r.doublyNestedActivityClass!=null && nestedObject instanceof Activity doublyNestedActivity && r.doublyNestedActivityClass.isInstance(nestedObject)){
ActivityPubObject doublyNestedObject;
if(doublyNestedActivity.object.object!=null)
doublyNestedObject=nestedActivity.object.object;
else
- doublyNestedObject=ObjectLinkResolver.resolve(nestedActivity.object.link);
+ doublyNestedObject=context(req).getObjectLinkResolver().resolve(nestedActivity.object.link);
if(r.objectClass.isInstance(doublyNestedObject)){
LOG.info("Found match: {}", r.handler.getClass().getName());
@@ -759,8 +786,7 @@ else if(o!=null)
private static String getActivityType(ActivityPubObject obj){
String r=obj.getType();
- if(obj instanceof Activity){
- Activity a=(Activity)obj;
+ if(obj instanceof Activity a){
r+="{";
if(a.object.object!=null){
r+=getActivityType(a.object.object);
@@ -791,98 +817,138 @@ public static ActivityPubCollectionPageResponse userFollowing(Request req, Respo
return followersOrFollowing(req, resp, false, offset, count);
}
- public static ActivityPubCollectionPageResponse groupFollowers(Request req, Response resp, int offset, int count) throws SQLException{
- int id=Utils.parseIntOrDefault(req.params(":id"), 0);
- Group group=GroupStorage.getById(id);
- if(group==null || group instanceof ForeignGroup){
- throw new ObjectNotFoundException();
- }
- int[] _total={0};
- List followers=GroupStorage.getGroupMemberURIs(group.id, false, offset, count, _total);
- return ActivityPubCollectionPageResponse.forLinks(followers, _total[0]);
+ private static ActivityPubCollectionPageResponse groupMembers(Request req, Response resp, int offset, int count, boolean tentative) throws SQLException{
+ int id=safeParseInt(req.params(":id"));
+ Group group=context(req).getGroupsController().getLocalGroupOrThrow(id);
+ ActivityPub.enforceGroupContentAccess(req, group);
+ PaginatedList followers=GroupStorage.getGroupMemberURIs(group.id, tentative, offset, count);
+ return ActivityPubCollectionPageResponse.forLinks(followers);
+ }
+
+ public static ActivityPubCollectionPageResponse groupMembers(Request req, Response resp, int offset, int count) throws SQLException{
+ return groupMembers(req, resp, offset, count, false);
}
- public static Object serviceActor(Request req, Response resp) throws SQLException{
+ public static ActivityPubCollectionPageResponse groupTentativeMembers(Request req, Response resp, int offset, int count) throws SQLException{
+ return groupMembers(req, resp, offset, count, true);
+ }
+
+ public static Object serviceActor(Request req, Response resp){
resp.type(ActivityPub.CONTENT_TYPE);
return ServiceActor.getInstance().asRootActivityPubObject();
}
+ public static Object groupActorToken(Request req, Response resp){
+ Group group=context(req).getGroupsController().getLocalGroupOrThrow(safeParseInt(req.params(":id")));
+ if(group.accessType==Group.AccessType.OPEN)
+ throw new ObjectNotFoundException();
+ Actor signer;
+ try{
+ signer=ActivityPub.verifyHttpSignature(req, null);
+ }catch(Exception x){
+ throw new UserActionNotAllowedException("Valid member HTTP signature is required.");
+ }
+ if(!(signer instanceof ForeignUser user))
+ throw new UserActionNotAllowedException("HTTP signature is valid but actor has wrong type: "+signer.getType());
+ resp.type("application/json");
+ return ActivityPub.generateActorToken(context(req), user, group);
+ }
+ public static Object userCollectionQuery(Request req, Response resp){
+ User user=context(req).getUsersController().getLocalUserOrThrow(safeParseInt(req.params(":id")));
+ return collectionQuery(user, req, resp);
+ }
- private static Actor verifyHttpSignature(Request req, Actor userHint) throws ParseException, NoSuchAlgorithmException, InvalidKeyException, SignatureException, SQLException{
- String sigHeader=req.headers("Signature");
- if(sigHeader==null)
- throw new BadRequestException("Request is missing Signature header");
- List> values=parseSignatureHeader(sigHeader);
- if(values.isEmpty())
- throw new BadRequestException("Signature header has invalid format");
- Map supportedSig=null;
- for(Map sig:values){
- if("rsa-sha256".equalsIgnoreCase(sig.get("algorithm"))){
- supportedSig=sig;
- break;
+ public static Object groupCollectionQuery(Request req, Response resp){
+ Group group=context(req).getGroupsController().getLocalGroupOrThrow(safeParseInt(req.params(":id")));
+ ActivityPub.enforceGroupContentAccess(req, group);
+ return collectionQuery(group, req, resp);
+ }
+
+ private static Object collectionQuery(Actor owner, Request req, Response resp){
+ URI collectionID;
+ try{
+ String _id=req.queryParams("collection");
+ if(StringUtils.isEmpty(_id)){
+ throw new BadRequestException("Collection ID (`collection` parameter) is required but was empty");
}
+ collectionID=new URI(_id);
+ }catch(URISyntaxException x){
+ throw new BadRequestException("Malformed collection ID", x);
}
- if(supportedSig==null)
- throw new BadRequestException("Unsupported signature algorithm \""+values.get(0).get("algorithm")+"\", expected \"rsa-sha256\"");
-
- if(!supportedSig.containsKey("keyId"))
- throw new BadRequestException("Signature header is missing keyId field");
- if(!supportedSig.containsKey("signature"))
- throw new BadRequestException("Signature header is missing signature field");
- if(!supportedSig.containsKey("headers"))
- throw new BadRequestException("Signature header is missing headers field");
-
- String keyId=supportedSig.get("keyId");
- byte[] signature=Base64.getDecoder().decode(supportedSig.get("signature"));
- List headers=Arrays.asList(supportedSig.get("headers").split(" "));
-
- if(!headers.contains("(request-target)"))
- throw new BadRequestException("(request-target) is not in signed headers");
- if(!headers.contains("date"))
- throw new BadRequestException("date is not in signed headers");
- if(!headers.contains("host"))
- throw new BadRequestException("host is not in signed headers");
-
- SimpleDateFormat dateFormat=new SimpleDateFormat("EEE, dd MMM yyyy HH:mm:ss z", Locale.US);
- dateFormat.setTimeZone(TimeZone.getTimeZone("GMT"));
- long unixtime=dateFormat.parse(req.headers("date")).getTime();
- long now=System.currentTimeMillis();
- long diff=now-unixtime;
- if(diff>30000L)
- throw new BadRequestException("Date is too far in the future (difference: "+diff+"ms)");
- if(diff<-30000L)
- throw new BadRequestException("Date is too far in the past (difference: "+diff+"ms)");
-
- URI userID=Utils.userIdFromKeyId(URI.create(keyId));
- Actor user;
- if(userHint.activityPubID.equals(userID))
- user=userHint;
- else
- user=ObjectLinkResolver.resolve(userID, Actor.class, false, true, false);
- if(user==null)
- throw new BadRequestException("Request signed by unknown user: "+userID);
-
- ArrayList sigParts=new ArrayList<>();
- for(String header:headers){
- String value;
- if(header.equals("(request-target)")){
- value=req.requestMethod().toLowerCase()+" "+req.pathInfo();
- }else{
- value=req.headers(header);
+ if(!Config.isLocal(collectionID))
+ throw new BadRequestException("Collection ID has wrong hostname, expected "+Config.domain);
+ String path=collectionID.getPath();
+ String actorPrefix=owner.getTypeAndIdForURL();
+ if(!path.startsWith(actorPrefix))
+ throw new BadRequestException("Collection path must start with actor prefix ("+actorPrefix+")");
+
+ if(req.queryParams("item")==null)
+ throw new BadRequestException("At least one `item` is required");
+
+ List items=Arrays.stream(req.queryMap("item").values()).map(s->{
+ try{
+ URI uri=new URI(s);
+ if(!"https".equals(uri.getScheme()) && !"http".equals(uri.getScheme()))
+ throw new BadRequestException("Invalid URL scheme: '"+s+"'");
+ return uri;
+ }catch(URISyntaxException x){
+ throw new BadRequestException("Invalid URL '"+s+"'", x);
}
- sigParts.add(header+": "+value);
- }
- String sigStr=String.join("\n", sigParts);
- Signature sig=Signature.getInstance("SHA256withRSA");
- sig.initVerify(user.publicKey);
- sig.update(sigStr.getBytes(StandardCharsets.UTF_8));
- if(!sig.verify(signature)){
- LOG.info("Failed signature header: {}", sigHeader);
- LOG.info("Failed signature string: '{}'", sigStr);
- throw new BadRequestException("Signature failed to verify");
- }
- return user;
+ }).limit(100).toList();
+
+ String collectionPath=path.substring(actorPrefix.length());
+ Collection filteredItems=switch(collectionPath){
+ case "/wall" -> queryWallCollection(req, owner, items);
+ case "/friends" -> {
+ if(owner instanceof User u){
+ yield queryUserFriendsCollection(req, u, items);
+ }else{
+ throw new BadRequestException("Unknown collection ID");
+ }
+ }
+ case "/groups" -> {
+ if(owner instanceof User u){
+ yield queryUserGroupsCollection(req, u, items);
+ }else{
+ throw new BadRequestException("Unknown collection ID");
+ }
+ }
+ case "/members", "/tentativeMembers" -> {
+ if(owner instanceof Group g){
+ yield queryGroupMembersCollection(req, g, items, "/tentativeMembers".equals(collectionPath));
+ }else{
+ throw new BadRequestException("Unknown collection ID");
+ }
+ }
+
+ case "/following", "/followers" -> throw new BadRequestException("Querying this collection is not supported");
+ default -> throw new BadRequestException("Unknown collection ID");
+ };
+
+ resp.type(ActivityPub.CONTENT_TYPE);
+ CollectionQueryResult res=new CollectionQueryResult();
+ res.partOf=collectionID;
+ res.items=filteredItems.stream().map(LinkOrObject::new).toList();
+ return res;
+ }
+
+ private static Collection queryWallCollection(Request req, Actor owner, List query){
+ return context(req).getWallController().getPostLocalIDsByActivityPubIDs(query, owner).keySet();
+ }
+
+ private static Collection queryUserFriendsCollection(Request req, User owner, List query){
+ return context(req).getFriendsController().getFriendsByActivityPubIDs(owner, query).keySet();
+ }
+
+ private static Collection queryGroupMembersCollection(Request req, Group owner, List query, boolean tentative){
+ if(tentative && !owner.isEvent())
+ throw new BadRequestException("Unknown collection ID");
+ return context(req).getGroupsController().getMembersByActivityPubIDs(owner, query, tentative).keySet();
+ }
+
+ private static Collection queryUserGroupsCollection(Request req, User owner, List query){
+ return context(req).getGroupsController().getUserGroupsByActivityPubIDs(owner, query).keySet();
}
private static boolean verifyHttpDigest(String digestHeader, byte[] bodyData){
@@ -904,27 +970,8 @@ private static boolean verifyHttpDigest(String digestHeader, byte[] bodyData){
return true;
}
- private static class ActivityTypeHandlerRecord{
- @NotNull
- final Class actorClass;
- @NotNull
- final Class activityClass;
- @Nullable
- final Class nestedActivityClass;
- @Nullable
- final Class doublyNestedActivityClass;
- @NotNull
- final Class objectClass;
- @NotNull
- final ActivityTypeHandler handler;
-
- public ActivityTypeHandlerRecord(@NotNull Class actorClass, @NotNull Class activityClass, @Nullable Class nestedActivityClass, @Nullable Class doublyNestedActivityClass, @NotNull Class objectClass, @NotNull ActivityTypeHandler handler){
- this.actorClass=actorClass;
- this.activityClass=activityClass;
- this.nestedActivityClass=nestedActivityClass;
- this.doublyNestedActivityClass=doublyNestedActivityClass;
- this.objectClass=objectClass;
- this.handler=handler;
+ private record ActivityTypeHandlerRecord
+ (@NotNull Class actorClass, @NotNull Class activityClass, @Nullable Class nestedActivityClass,
+ @Nullable Class doublyNestedActivityClass, @NotNull Class objectClass, @NotNull ActivityTypeHandler handler){
}
- }
}
diff --git a/src/main/java/smithereen/routes/GroupsRoutes.java b/src/main/java/smithereen/routes/GroupsRoutes.java
index 5768289a..656653b5 100644
--- a/src/main/java/smithereen/routes/GroupsRoutes.java
+++ b/src/main/java/smithereen/routes/GroupsRoutes.java
@@ -7,17 +7,26 @@
import java.net.URI;
import java.net.URLEncoder;
import java.sql.SQLException;
+import java.time.Instant;
+import java.time.LocalDate;
+import java.time.ZoneId;
+import java.time.format.DateTimeParseException;
+import java.util.ArrayList;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
-import java.util.Set;
+import java.util.Objects;
import java.util.stream.Collectors;
+import smithereen.activitypub.objects.Actor;
+import smithereen.activitypub.objects.PropertyValue;
+import smithereen.controllers.GroupsController;
+import smithereen.data.ActorWithDescription;
import smithereen.data.ForeignUser;
-import smithereen.data.ListAndTotal;
+import smithereen.data.FriendshipStatus;
+import smithereen.data.PaginatedList;
import smithereen.data.SizedImage;
-import smithereen.data.feed.NewsfeedEntry;
import smithereen.exceptions.BadRequestException;
import smithereen.Config;
import smithereen.data.GroupAdmin;
@@ -34,10 +43,7 @@
import smithereen.data.WebDeltaResponse;
import smithereen.exceptions.UserActionNotAllowedException;
import smithereen.lang.Lang;
-import smithereen.storage.DatabaseUtils;
import smithereen.storage.GroupStorage;
-import smithereen.storage.NewsfeedStorage;
-import smithereen.storage.PostStorage;
import smithereen.storage.UserStorage;
import smithereen.templates.RenderedTemplateResponse;
import spark.Request;
@@ -49,55 +55,66 @@
public class GroupsRoutes{
- private static Group getGroup(Request req) throws SQLException{
+ private static Group getGroup(Request req){
int id=parseIntOrDefault(req.params(":id"), 0);
- Group group=GroupStorage.getById(id);
- if(group==null){
- throw new ObjectNotFoundException("err_group_not_found");
- }
- return group;
+ return context(req).getGroupsController().getGroupOrThrow(id);
}
- private static Group getGroupAndRequireLevel(Request req, Account self, Group.AdminLevel level) throws SQLException{
+ private static Group getGroupAndRequireLevel(Request req, Account self, Group.AdminLevel level){
Group group=getGroup(req);
- if(!GroupStorage.getGroupMemberAdminLevel(group.id, self.user.id).isAtLeast(level)){
- throw new UserActionNotAllowedException();
- }
+ context(req).getGroupsController().enforceUserAdminLevel(group, self.user, level);
return group;
}
- public static Object myGroups(Request req, Response resp, Account self) throws SQLException{
- jsLangKey(req, "cancel", "create");
- RenderedTemplateResponse model=new RenderedTemplateResponse("groups", req).with("tab", "groups").with("title", lang(req).get("groups"));
- model.with("groups", GroupStorage.getUserGroups(self.user.id));
- model.with("owner", self.user);
- return model;
+ public static Object myGroups(Request req, Response resp, Account self){
+ return userGroups(req, resp, self.user);
}
- public static Object userGroups(Request req, Response resp) throws SQLException{
+ public static Object userGroups(Request req, Response resp){
int uid=parseIntOrDefault(req.params(":id"), 0);
- if(uid==0)
- throw new ObjectNotFoundException("err_user_not_found");
- User user=UserStorage.getById(uid);
- if(user==null)
- throw new ObjectNotFoundException("err_user_not_found");
+ User user=context(req).getUsersController().getUserOrThrow(uid);
+ return userGroups(req, resp, user);
+ }
+
+ public static Object userGroups(Request req, Response resp, User user){
jsLangKey(req, "cancel", "create");
+ SessionInfo info=sessionInfo(req);
RenderedTemplateResponse model=new RenderedTemplateResponse("groups", req).with("tab", "groups").with("title", lang(req).get("groups"));
- model.with("groups", GroupStorage.getUserGroups(user.id));
+ model.paginate(context(req).getGroupsController().getUserGroups(user, info!=null && info.account!=null ? info.account.user : null, offset(req), 100));
model.with("owner", user);
return model;
}
- public static Object myManagedGroups(Request req, Response resp, Account self) throws SQLException{
+ public static Object myManagedGroups(Request req, Response resp, Account self){
jsLangKey(req, "cancel", "create");
RenderedTemplateResponse model=new RenderedTemplateResponse("groups", req).with("tab", "managed").with("title", lang(req).get("groups"));
- model.with("groups", GroupStorage.getUserManagedGroups(self.user.id)).with("owner", self.user);
+ model.paginate(context(req).getGroupsController().getUserManagedGroups(self.user, offset(req), 100)).with("owner", self.user);
return model;
}
- public static Object createGroup(Request req, Response resp, Account self) throws SQLException{
+ public static Object myEvents(Request req, Response resp, Account self){
+ return myEvents(req, resp, self, GroupsController.EventsType.FUTURE);
+ }
+
+ public static Object myPastEvents(Request req, Response resp, Account self){
+ return myEvents(req, resp, self, GroupsController.EventsType.PAST);
+ }
+
+ public static Object myEvents(Request req, Response resp, Account self, GroupsController.EventsType type){
+ jsLangKey(req, "cancel", "create");
+ RenderedTemplateResponse model=new RenderedTemplateResponse("groups", req).with("events", true).with("tab", type==GroupsController.EventsType.PAST ? "past" : "events").with("owner", self.user).pageTitle(lang(req).get("events"));
+ model.paginate(context(req).getGroupsController().getUserEvents(self.user, type, offset(req), 100));
+ return model;
+ }
+
+ public static Object createGroup(Request req, Response resp, Account self){
RenderedTemplateResponse model=new RenderedTemplateResponse("create_group", req);
- return wrapForm(req, resp, "create_group", "/my/groups/create", lang(req).get("create_group"), "create", model);
+ return wrapForm(req, resp, "create_group", "/my/groups/create", lang(req).get("create_group_title"), "create", model);
+ }
+
+ public static Object createEvent(Request req, Response resp, Account self){
+ RenderedTemplateResponse model=new RenderedTemplateResponse("create_event", req);
+ return wrapForm(req, resp, "create_event", "/my/groups/create?type=event", lang(req).get("create_event_title"), "create", model);
}
private static Object groupCreateError(Request req, Response resp, String errKey){
@@ -106,78 +123,104 @@ private static Object groupCreateError(Request req, Response resp, String errKey
}
RenderedTemplateResponse model=new RenderedTemplateResponse("create_group", req);
model.with("groupName", req.queryParams("name")).with("groupUsername", req.queryParams("username"));
- return wrapForm(req, resp, "create_group", "/my/groups/create", lang(req).get("create_group"), "create", model);
+ return wrapForm(req, resp, "create_group", "/my/groups/create", lang(req).get("create_group_title"), "create", model);
}
- public static Object doCreateGroup(Request req, Response resp, Account self) throws SQLException{
- String username=req.queryParams("username");
+ public static Object doCreateGroup(Request req, Response resp, Account self){
String name=req.queryParams("name");
+ String description=req.queryParams("description");
+ Group group;
+ if("event".equals(req.queryParams("type"))){
+ String eventTime=req.queryParams("event_start_time");
+ String eventDate=req.queryParams("event_start_date");
+ if(StringUtils.isEmpty(eventDate) || StringUtils.isEmpty(eventTime))
+ throw new BadRequestException("date/time empty");
- if(!isValidUsername(username))
- return groupCreateError(req, resp, "err_group_invalid_username");
- if(isReservedUsername(username))
- return groupCreateError(req, resp, "err_group_reserved_username");
-
- final int[] id={0};
- boolean r=DatabaseUtils.runWithUniqueUsername(username, ()->{
- id[0]=GroupStorage.createGroup(name, username, self.user.id);
- });
-
- if(r){
- ActivityPubWorker.getInstance().sendAddToGroupsCollectionActivity(self.user, GroupStorage.getById(id[0]));
- if(isAjax(req)){
- return new WebDeltaResponse(resp).replaceLocation("/"+username);
- }else{
- resp.redirect(Config.localURI("/"+username).toString());
- return "";
+ try{
+ Instant eventStart=instantFromDateAndTime(req, eventDate, eventTime);
+ group=context(req).getGroupsController().createEvent(self.user, name, description, eventStart, null);
+ }catch(DateTimeParseException x){
+ throw new BadRequestException(x);
}
}else{
- return groupCreateError(req, resp, "err_group_username_taken");
+ group=context(req).getGroupsController().createGroup(self.user, name, description);
+ }
+ if(isAjax(req)){
+ return new WebDeltaResponse(resp).replaceLocation("/"+group.username);
+ }else{
+ resp.redirect(Config.localURI("/"+group.username).toString());
+ return "";
}
}
- public static Object groupProfile(Request req, Response resp, Group group) throws SQLException{
- int pageOffset=parseIntOrDefault(req.queryParams("offset"), 0);
+ public static Object groupProfile(Request req, Response resp, Group group){
SessionInfo info=Utils.sessionInfo(req);
@Nullable Account self=info!=null ? info.account : null;
- List members=GroupStorage.getRandomMembersForProfile(group.id);
- int[] totalPosts={0};
- List wall=PostStorage.getWallPosts(group.id, true, 0, 0, pageOffset, totalPosts, false);
- Set postIDs=wall.stream().map((Post p)->p.id).collect(Collectors.toSet());
-
- if(req.attribute("mobile")==null){
- Map> allComments=PostStorage.getRepliesForFeed(postIDs);
- for(Post post:wall){
- ListAndTotal comments=allComments.get(post.id);
- if(comments!=null){
- post.repliesObjects=comments.list;
- post.totalTopLevelComments=comments.total;
- post.getAllReplyIDs(postIDs);
- }
+ Group.MembershipState membershipState;
+ if(self==null){
+ membershipState=Group.MembershipState.NONE;
+ }else{
+ membershipState=context(req).getGroupsController().getUserMembershipState(group, self.user);
+ }
+
+ boolean canAccessContent=true;
+ if(membershipState!=Group.MembershipState.MEMBER && membershipState!=Group.MembershipState.TENTATIVE_MEMBER){
+ if(group.accessType==Group.AccessType.CLOSED){
+ canAccessContent=false;
+ }else if(group.accessType==Group.AccessType.PRIVATE){
+ return wrapError(req, resp, group.isEvent() ? "event_private_no_access" : "group_private_no_access");
}
}
- HashMap interactions=PostStorage.getPostInteractions(postIDs, self!=null ? self.user.id : 0);
- Lang l=lang(req);
+ Lang l=lang(req);
RenderedTemplateResponse model=new RenderedTemplateResponse("group", req);
- model.with("group", group).with("members", members).with("postCount", totalPosts[0]).with("pageOffset", pageOffset).with("wall", wall);
- model.with("postInteractions", interactions);
+
+ // Public info: still visible for non-members in public groups
+ List members=context(req).getGroupsController().getRandomMembersForProfile(group, false);
+ model.with("group", group).with("members", members);
+ if(group.isEvent())
+ model.with("tentativeMembers", context(req).getGroupsController().getRandomMembersForProfile(group, true));
model.with("title", group.name);
- model.with("admins", GroupStorage.getGroupAdmins(group.id));
+ model.with("admins", context(req).getGroupsController().getAdmins(group));
+ model.with("canAccessContent", canAccessContent);
+
+ // Wall posts
+ int wallPostsCount=0;
+ if(canAccessContent){
+ int offset=offset(req);
+ PaginatedList wall=context(req).getWallController().getWallPosts(group, false, offset, 20);
+ wallPostsCount=wall.total;
+ if(req.attribute("mobile")==null){
+ context(req).getWallController().populateCommentPreviews(wall.list);
+ }
+ Map interactions=context(req).getWallController().getUserInteractions(wall.list, self!=null ? self.user : null);
+ model.with("postCount", wall.total).paginate(wall);
+ model.with("postInteractions", interactions);
+ }
+
if(group instanceof ForeignGroup)
model.with("noindex", true);
+
jsLangKey(req, "yes", "no", "delete_post", "delete_post_confirm", "delete_reply", "delete_reply_confirm", "remove_friend", "cancel", "delete", "post_form_cw", "post_form_cw_placeholder", "attach_menu_photo", "attach_menu_cw", "attach_menu_poll", "max_file_size_exceeded", "max_attachment_count_exceeded", "remove_attachment");
jsLangKey(req, "create_poll_question", "create_poll_options", "create_poll_add_option", "create_poll_delete_option", "create_poll_multi_choice", "create_poll_anonymous", "create_poll_time_limit", "X_days", "X_hours");
if(self!=null){
- Group.AdminLevel level=GroupStorage.getGroupMemberAdminLevel(group.id, self.user.id);
- model.with("membershipState", GroupStorage.getUserMembershipState(group.id, self.user.id));
+ Group.AdminLevel level=context(req).getGroupsController().getMemberAdminLevel(group, self.user);
+ model.with("membershipState", membershipState);
model.with("groupAdminLevel", level);
if(level.isAtLeast(Group.AdminLevel.ADMIN)){
jsLangKey(req, "update_profile_picture", "save", "profile_pic_select_square_version", "drag_or_choose_file", "choose_file",
"drop_files_here", "picture_too_wide", "picture_too_narrow", "ok", "error", "error_loading_picture",
"remove_profile_picture", "confirm_remove_profile_picture", "choose_file_mobile");
}
+ if(group.isEvent()){
+ if(membershipState==Group.MembershipState.MEMBER)
+ model.with("membershipStateText", l.get("event_joined_certain"));
+ else if(membershipState==Group.MembershipState.TENTATIVE_MEMBER)
+ model.with("membershipStateText", l.get("event_joined_tentative"));
+ }
+ if(membershipState==Group.MembershipState.REQUESTED)
+ model.with("membershipStateText", l.get("requested_to_join"));
}else{
HashMap meta=new LinkedHashMap<>();
meta.put("og:type", "profile");
@@ -185,7 +228,9 @@ public static Object groupProfile(Request req, Response resp, Group group) throw
meta.put("og:title", group.name);
meta.put("og:url", group.url.toString());
meta.put("og:username", group.getFullUsername());
- String descr=l.get("X_members", Map.of("count", group.memberCount))+", "+l.get("X_posts", Map.of("count", totalPosts[0]));
+ String descr=l.get("X_members", Map.of("count", group.memberCount));
+ if(wallPostsCount>0)
+ descr+=", "+l.get("X_posts", Map.of("count", wallPostsCount));
if(StringUtils.isNotEmpty(group.summary))
descr+="\n"+Jsoup.clean(group.summary, Whitelist.none());
meta.put("og:description", descr);
@@ -202,24 +247,29 @@ public static Object groupProfile(Request req, Response resp, Group group) throw
model.with("moreMetaTags", Map.of("description", descr));
}
model.with("activityPubURL", group.activityPubID);
- model.addNavBarItem(l.get("open_group"));
+ model.addNavBarItem(l.get(switch(group.type){
+ case GROUP -> switch(group.accessType){
+ case OPEN -> "open_group";
+ case CLOSED -> "closed_group";
+ case PRIVATE -> "private_group";
+ };
+ case EVENT -> group.accessType==Group.AccessType.OPEN ? "open_event" : "private_event";
+ }));
+ ArrayList profileFields=new ArrayList<>();
+ if(StringUtils.isNotEmpty(group.summary))
+ profileFields.add(new PropertyValue(l.get(group.type==Group.Type.EVENT ? "about_event" : "about_group"), group.summary));
+ if(group.type==Group.Type.EVENT){
+ profileFields.add(new PropertyValue(l.get("event_start_time"), l.formatDate(group.eventStartTime, timeZoneForRequest(req), false)));
+ if(group.eventEndTime!=null)
+ profileFields.add(new PropertyValue(l.get("event_end_time"), l.formatDate(group.eventEndTime, timeZoneForRequest(req), false)));
+ }
+ model.with("profileFields", profileFields);
return model;
}
- public static Object join(Request req, Response resp, Account self) throws SQLException{
+ public static Object join(Request req, Response resp, Account self){
Group group=getGroup(req);
- ensureUserNotBlocked(self.user, group);
- Group.MembershipState state=GroupStorage.getUserMembershipState(group.id, self.user.id);
- if(state==Group.MembershipState.MEMBER || state==Group.MembershipState.TENTATIVE_MEMBER){
- return wrapError(req, resp, "err_group_already_member");
- }
- GroupStorage.joinGroup(group, self.user.id, false, !(group instanceof ForeignGroup));
- if(group instanceof ForeignGroup){
- ActivityPubWorker.getInstance().sendFollowActivity(self.user, (ForeignGroup) group);
- }else{
- ActivityPubWorker.getInstance().sendAddToGroupsCollectionActivity(self.user, group);
- }
- NewsfeedStorage.putEntry(self.user.id, group.id, NewsfeedEntry.Type.JOIN_GROUP, null);
+ context(req).getGroupsController().joinGroup(group, self.user, "1".equals(req.queryParams("tentative")));
if(isAjax(req)){
return new WebDeltaResponse(resp).refresh();
}
@@ -229,17 +279,7 @@ public static Object join(Request req, Response resp, Account self) throws SQLEx
public static Object leave(Request req, Response resp, Account self) throws SQLException{
Group group=getGroup(req);
- Group.MembershipState state=GroupStorage.getUserMembershipState(group.id, self.user.id);
- if(state!=Group.MembershipState.MEMBER && state!=Group.MembershipState.TENTATIVE_MEMBER){
- return wrapError(req, resp, "err_group_not_member");
- }
- GroupStorage.leaveGroup(group, self.user.id, state==Group.MembershipState.TENTATIVE_MEMBER);
- if(group instanceof ForeignGroup){
- ActivityPubWorker.getInstance().sendUnfollowActivity(self.user, (ForeignGroup) group);
- }else{
- ActivityPubWorker.getInstance().sendRemoveFromGroupsCollectionActivity(self.user, group);
- }
- NewsfeedStorage.deleteEntry(self.user.id, group.id, NewsfeedEntry.Type.JOIN_GROUP);
+ context(req).getGroupsController().leaveGroup(group, self.user);
if(isAjax(req)){
return new WebDeltaResponse(resp).refresh();
}
@@ -247,7 +287,7 @@ public static Object leave(Request req, Response resp, Account self) throws SQLE
return "";
}
- public static Object editGeneral(Request req, Response resp, Account self) throws SQLException{
+ public static Object editGeneral(Request req, Response resp, Account self){
Group group=getGroupAndRequireLevel(req, self, Group.AdminLevel.ADMIN);
RenderedTemplateResponse model=new RenderedTemplateResponse("group_edit_general", req);
model.with("group", group).with("title", group.name);
@@ -259,22 +299,41 @@ public static Object editGeneral(Request req, Response resp, Account self) throw
return model;
}
- public static Object saveGeneral(Request req, Response resp, Account self) throws SQLException{
- Group group=getGroupAndRequireLevel(req, self, Group.AdminLevel.ADMIN);
- String name=req.queryParams("name"), about=req.queryParams("about");
+ public static Object saveGeneral(Request req, Response resp, Account self){
+ Group group=getGroup(req);
+ String name=req.queryParams("name"), about=req.queryParams("about"), username=req.queryParams("username");
+ Group.AccessType accessType=enumValue(req.queryParams("access"), Group.AccessType.class);
String message;
- if(StringUtils.isEmpty(name) || name.length()<1){
- message=lang(req).get("group_name_too_short");
- }else{
+ try{
+ if(StringUtils.isEmpty(name) || name.length()<1)
+ throw new BadRequestException(lang(req).get("group_name_too_short"));
+
+ Instant eventStart=null, eventEnd=null;
+ if(group.isEvent()){
+ String startTime=req.queryParams("event_start_time"), startDate=req.queryParams("event_start_date");
+ String endTime=req.queryParams("event_end_time"), endDate=req.queryParams("event_end_date");
+ if(StringUtils.isEmpty(startTime) || StringUtils.isEmpty(startDate))
+ throw new BadRequestException("start date/time empty");
+ try{
+ eventStart=instantFromDateAndTime(req, startDate, startTime);
+ if(StringUtils.isNotEmpty(endDate) && StringUtils.isNotEmpty(endTime))
+ eventEnd=instantFromDateAndTime(req, endDate, endTime);
+ }catch(DateTimeParseException x){
+ throw new BadRequestException(x);
+ }
+ if(eventEnd!=null && eventStart.isAfter(eventEnd))
+ throw new BadRequestException(lang(req).get("err_event_end_time_before_start"));
+ }
+
if(StringUtils.isEmpty(about))
about=null;
- else
- about=preprocessPostHTML(about, null);
- GroupStorage.updateGroupGeneralInfo(group, name, about);
- message=lang(req).get("group_info_updated");
+
+ context(req).getGroupsController().updateGroupInfo(group, self.user, name, about, eventStart, eventEnd, username, accessType);
+
+ message=lang(req).get(group.isEvent() ? "event_info_updated" : "group_info_updated");
+ }catch(BadRequestException x){
+ message=x.getMessage();
}
- group=GroupStorage.getById(group.id);
- ActivityPubWorker.getInstance().sendUpdateGroupActivity(group);
if(isAjax(req)){
return new WebDeltaResponse(resp).show("formMessage_groupEdit").setContent("formMessage_groupEdit", message);
}
@@ -283,54 +342,62 @@ public static Object saveGeneral(Request req, Response resp, Account self) throw
return "";
}
- public static Object members(Request req, Response resp) throws SQLException{
+ public static Object members(Request req, Response resp){
+ return members(req, resp, false);
+ }
+
+ public static Object tentativeMembers(Request req, Response resp){
+ return members(req, resp, true);
+ }
+
+ private static Object members(Request req, Response resp, boolean tentative){
Group group=getGroup(req);
- int offset=parseIntOrDefault(req.queryParams("offset"), 0);
- ListAndTotal users=GroupStorage.getMembers(group.id, offset, 100);
- RenderedTemplateResponse model=new RenderedTemplateResponse(isAjax(req) ? "user_grid" : "content_wrap", req).with("users", users.list);
- model.with("pageOffset", offset).with("total", group.memberCount).with("paginationUrlPrefix", "/groups/"+group.id+"/members?offset=");
- model.with("summary", lang(req).get("summary_group_X_members", Map.of("count", group.memberCount)));
-// if(isAjax(req)){
-// if(req.queryParams("fromPagination")==null)
-// return new WebDeltaResponseBuilder(resp).box(lang(req).get("likes_title"), model, "likesList", 596);
-// else
-// return new WebDeltaResponseBuilder(resp).setContent("likesList", model);
-// }
+ if(tentative && !group.isEvent())
+ throw new BadRequestException();
+ SessionInfo info=sessionInfo(req);
+ context(req).getPrivacyController().enforceUserAccessToGroupProfile(info!=null && info.account!=null ? info.account.user : null, group);
+ RenderedTemplateResponse model=new RenderedTemplateResponse(isAjax(req) ? "user_grid" : "content_wrap", req);
+ model.paginate(context(req).getGroupsController().getMembers(group, offset(req), 100, tentative));
+ model.with("summary", lang(req).get(tentative ? "summary_event_X_tentative_members" : (group.isEvent() ? "summary_event_X_members" : "summary_group_X_members"), Map.of("count", tentative ? group.tentativeMemberCount : group.memberCount)));
model.with("contentTemplate", "user_grid").with("title", group.name);
return model;
}
- public static Object admins(Request req, Response resp) throws SQLException{
+ public static Object admins(Request req, Response resp){
Group group=getGroup(req);
- RenderedTemplateResponse model=new RenderedTemplateResponse("group_admins", req);
- model.with("admins", GroupStorage.getGroupAdmins(group.id));
+ SessionInfo info=sessionInfo(req);
+ context(req).getPrivacyController().enforceUserAccessToGroupProfile(info!=null && info.account!=null ? info.account.user : null, group);
+ RenderedTemplateResponse model=new RenderedTemplateResponse("actor_list", req);
+ model.with("actors", context(req).getGroupsController().getAdmins(group).stream().map(a->new ActorWithDescription(a.user, a.title)).collect(Collectors.toList()));
if(isAjax(req)){
- return new WebDeltaResponse(resp).box(lang(req).get("group_admins"), model.renderContentBlock(), null, true);
+ return new WebDeltaResponse(resp).box(lang(req).get(group.isEvent() ? "event_organizers" : "group_admins"), model.renderContentBlock(), null, true);
}
return model;
}
- public static Object editAdmins(Request req, Response resp, Account self) throws SQLException{
+ public static Object editAdmins(Request req, Response resp, Account self){
Group group=getGroupAndRequireLevel(req, self, Group.AdminLevel.ADMIN);
RenderedTemplateResponse model=new RenderedTemplateResponse("group_edit_admins", req);
model.with("group", group).with("title", group.name);
- model.with("admins", GroupStorage.getGroupAdmins(group.id));
+ model.with("admins", context(req).getGroupsController().getAdmins(group));
+ model.with("subtab", "admins");
+ model.with("joinRequestCount", context(req).getGroupsController().getJoinRequestCount(self.user, group));
jsLangKey(req, "cancel", "group_admin_demote", "yes", "no");
return model;
}
- public static Object editMembers(Request req, Response resp, Account self) throws SQLException{
+ public static Object editMembers(Request req, Response resp, Account self){
Group group=getGroupAndRequireLevel(req, self, Group.AdminLevel.MODERATOR);
- Group.AdminLevel level=GroupStorage.getGroupMemberAdminLevel(group.id, self.user.id);
+ Group.AdminLevel level=context(req).getGroupsController().getMemberAdminLevel(group, self.user);
RenderedTemplateResponse model=new RenderedTemplateResponse("group_edit_members", req);
- int offset=parseIntOrDefault(req.queryParams("offset"), 0);
- List users=GroupStorage.getMembers(group.id, offset, 100).list;
- model.with("pageOffset", offset).with("total", group.memberCount).with("paginationUrlPrefix", "/groups/"+group.id+"/editMembers?offset=");
+ model.paginate(context(req).getGroupsController().getAllMembers(group, offset(req), 100));
model.with("group", group).with("title", group.name);
- model.with("members", users);
- model.with("adminIDs", GroupStorage.getGroupAdmins(group.id).stream().map(adm->adm.user.id).collect(Collectors.toList()));
+ model.with("adminIDs", context(req).getGroupsController().getAdmins(group).stream().map(adm->adm.user.id).collect(Collectors.toList()));
model.with("canAddAdmins", level.isAtLeast(Group.AdminLevel.ADMIN));
model.with("adminLevel", level);
+ model.with("subtab", "all");
+ model.with("summaryKey", group.isEvent() ? "summary_event_X_members" : "summary_group_X_members");
+ model.with("joinRequestCount", context(req).getGroupsController().getJoinRequestCount(self.user, group));
jsLangKey(req, "cancel", "yes", "no");
return model;
}
@@ -376,23 +443,18 @@ public static Object saveAdmin(Request req, Response resp, Account self) throws
return "";
}
- public static Object confirmDemoteAdmin(Request req, Response resp, Account self) throws SQLException{
+ public static Object confirmDemoteAdmin(Request req, Response resp, Account self){
Group group=getGroupAndRequireLevel(req, self, Group.AdminLevel.ADMIN);
- int userID=parseIntOrDefault(req.queryParams("id"), 0);
- User user=UserStorage.getById(userID);
- if(user==null)
- throw new ObjectNotFoundException("user_not_found");
-
+ int userID=safeParseInt(req.queryParams("id"));
+ User user=context(req).getUsersController().getUserOrThrow(userID);
String back=Utils.back(req);
return new RenderedTemplateResponse("generic_confirm", req).with("message", Utils.lang(req).get("group_admin_demote_confirm", Map.of("name", user.getFirstLastAndGender()))).with("formAction", Config.localURI("/groups/"+group.id+"/removeAdmin?_redir="+URLEncoder.encode(back)+"&id="+userID)).with("back", back);
}
public static Object removeAdmin(Request req, Response resp, Account self) throws SQLException{
Group group=getGroupAndRequireLevel(req, self, Group.AdminLevel.ADMIN);
- int userID=parseIntOrDefault(req.queryParams("id"), 0);
- User user=UserStorage.getById(userID);
- if(user==null)
- throw new ObjectNotFoundException("user_not_found");
+ int userID=safeParseInt(req.queryParams("id"));
+ User user=context(req).getUsersController().getUserOrThrow(userID);
GroupStorage.removeGroupAdmin(group.id, userID);
@@ -427,7 +489,7 @@ public static Object blocking(Request req, Response resp, Account self) throws S
return model;
}
- public static Object blockDomainForm(Request req, Response resp, Account self) throws SQLException{
+ public static Object blockDomainForm(Request req, Response resp, Account self){
Group group=getGroupAndRequireLevel(req, self, Group.AdminLevel.MODERATOR);
RenderedTemplateResponse model=new RenderedTemplateResponse("block_domain", req);
return wrapForm(req, resp, "block_domain", "/groups/"+group.id+"/blockDomain", lang(req).get("block_a_domain"), "block", model);
@@ -447,7 +509,7 @@ public static Object blockDomain(Request req, Response resp, Account self) throw
return "";
}
- public static Object confirmUnblockDomain(Request req, Response resp, Account self) throws SQLException{
+ public static Object confirmUnblockDomain(Request req, Response resp, Account self){
Group group=getGroupAndRequireLevel(req, self, Group.AdminLevel.MODERATOR);
String domain=req.queryParams("domain");
Lang l=Utils.lang(req);
@@ -466,30 +528,25 @@ public static Object unblockDomain(Request req, Response resp, Account self) thr
return "";
}
- private static User getUserOrThrow(Request req) throws SQLException{
+ private static User getUserOrThrow(Request req){
int id=parseIntOrDefault(req.queryParams("id"), 0);
- if(id==0)
- throw new ObjectNotFoundException("err_user_not_found");
- User user=UserStorage.getById(id);
- if(user==null)
- throw new ObjectNotFoundException("err_user_not_found");
- return user;
+ return context(req).getUsersController().getUserOrThrow(id);
}
- public static Object confirmBlockUser(Request req, Response resp, Account self) throws SQLException{
+ public static Object confirmBlockUser(Request req, Response resp, Account self){
Group group=getGroupAndRequireLevel(req, self, Group.AdminLevel.MODERATOR);
User user=getUserOrThrow(req);
Lang l=Utils.lang(req);
String back=Utils.back(req);
- return new RenderedTemplateResponse("generic_confirm", req).with("message", l.get("confirm_block_user_X", Map.of("user", user.getFirstLastAndGender()))).with("formAction", "/groups/"+group.id+"/blockUser?id="+user.id+"&_redir="+URLEncoder.encode(back)).with("back", back);
+ return new RenderedTemplateResponse("generic_confirm", req).with("message", l.get("confirm_block_user_X", Map.of("name", user.getFirstLastAndGender()))).with("formAction", "/groups/"+group.id+"/blockUser?id="+user.id+"&_redir="+URLEncoder.encode(back)).with("back", back);
}
- public static Object confirmUnblockUser(Request req, Response resp, Account self) throws SQLException{
+ public static Object confirmUnblockUser(Request req, Response resp, Account self){
Group group=getGroupAndRequireLevel(req, self, Group.AdminLevel.MODERATOR);
User user=getUserOrThrow(req);
Lang l=Utils.lang(req);
String back=Utils.back(req);
- return new RenderedTemplateResponse("generic_confirm", req).with("message", l.get("confirm_unblock_user_X", Map.of("user", user.getFirstLastAndGender()))).with("formAction", "/groups/"+group.id+"/unblockUser?id="+user.id+"&_redir="+URLEncoder.encode(back)).with("back", back);
+ return new RenderedTemplateResponse("generic_confirm", req).with("message", l.get("confirm_unblock_user_X", Map.of("name", user.getFirstLastAndGender()))).with("formAction", "/groups/"+group.id+"/unblockUser?id="+user.id+"&_redir="+URLEncoder.encode(back)).with("back", back);
}
public static Object blockUser(Request req, Response resp, Account self) throws SQLException{
@@ -499,7 +556,7 @@ public static Object blockUser(Request req, Response resp, Account self) throws
throw new BadRequestException("Can't block a group manager");
GroupStorage.blockUser(group.id, user.id);
if(user instanceof ForeignUser)
- ActivityPubWorker.getInstance().sendBlockActivity(group, (ForeignUser) user);
+ context(req).getActivityPubWorker().sendBlockActivity(group, (ForeignUser) user);
if(isAjax(req))
return new WebDeltaResponse(resp).refresh();
resp.redirect(back(req));
@@ -511,10 +568,381 @@ public static Object unblockUser(Request req, Response resp, Account self) throw
User user=getUserOrThrow(req);
GroupStorage.unblockUser(group.id, user.id);
if(user instanceof ForeignUser)
- ActivityPubWorker.getInstance().sendUndoBlockActivity(group, (ForeignUser) user);
+ context(req).getActivityPubWorker().sendUndoBlockActivity(group, (ForeignUser) user);
if(isAjax(req))
return new WebDeltaResponse(resp).refresh();
resp.redirect(back(req));
return "";
}
+
+ public static Object eventCalendar(Request req, Response resp, Account self){
+ ZoneId timeZone=timeZoneForRequest(req).toZoneId();
+ LocalDate today=LocalDate.now(timeZone);
+ LocalDate tomorrow=today.plusDays(1);
+ RenderedTemplateResponse model=new RenderedTemplateResponse(isAjax(req) ? "events_actual_calendar" : "events_calendar", req);
+
+ if(!isAjax(req) && !isMobile(req)){
+ List birthdays=context(req).getUsersController().getFriendsWithBirthdaysWithinTwoDays(self.user, today);
+ model.with("birthdays", birthdays);
+ if(!birthdays.isEmpty()){
+ HashMap days=new HashMap<>(birthdays.size()), ages=new HashMap<>(birthdays.size());
+ for(User user : birthdays){
+ days.put(user.id, lang(req).get(today.getDayOfMonth()==user.birthDate.getDayOfMonth() && today.getMonthValue()==user.birthDate.getMonthValue() ? "date_today" : "date_tomorrow"));
+ LocalDate birthday=user.birthDate.withYear(today.getYear());
+ if(birthday.isBefore(today))
+ birthday=birthday.plusYears(1);
+ ages.put(user.id, lang(req).get("X_years", Map.of("count", birthday.getYear()-user.birthDate.getYear())));
+ }
+ model.with("userDays", days).with("userAges", ages);
+ }
+ PaginatedList events=context(req).getGroupsController().getUserEvents(self.user, GroupsController.EventsType.FUTURE, 0, 10);
+ Instant eventMaxTime=tomorrow.atTime(23, 59, 59).atZone(timeZone).toInstant();
+ List eventsWithinTwoDays=events.list.stream().filter(e->e.eventStartTime.isBefore(eventMaxTime)).toList();
+ model.with("events", eventsWithinTwoDays);
+ }
+
+ int month=safeParseInt(req.queryParams("month"));
+ int year=safeParseInt(req.queryParams("year"));
+ LocalDate monthStart;
+ if(month<1 || month>12 || year==0){
+ monthStart=LocalDate.now(timeZone).withDayOfMonth(1);
+ month=monthStart.getMonthValue();
+ year=monthStart.getYear();
+ }else{
+ monthStart=LocalDate.of(year, month, 1);
+ }
+ model.with("year", year).with("month", month).with("monthLength", monthStart.lengthOfMonth()).with("monthStartWeekday", monthStart.getDayOfWeek().getValue());
+ model.with("todayDay", today.getDayOfMonth()).with("todayMonth", today.getMonthValue()).with("todayYear", today.getYear());
+ Lang l=lang(req);
+ Instant now=Instant.now();
+
+ ArrayList eventsInMonth=new ArrayList<>();
+ eventsInMonth.addAll(context(req).getUsersController().getFriendsWithBirthdaysInMonth(self.user, month));
+ eventsInMonth.addAll(context(req).getGroupsController().getUserEventsInMonth(self.user, year, month, timeZone));
+ if(isMobile(req)){
+ Map> eventsByDay=eventsInMonth.stream()
+ .map(a->new ActorWithDescription(a, getActorCalendarDescription(a, l, today, monthStart, now, timeZone)))
+ .collect(Collectors.groupingBy(a->{
+ if(a.actor() instanceof User u)
+ return u.birthDate.getDayOfMonth();
+ else if(a.actor() instanceof Group g)
+ return g.eventStartTime.atZone(timeZone).getDayOfMonth();
+ else
+ throw new IllegalStateException();
+ }));
+ model.with("calendarEvents", eventsByDay);
+ }else{
+ Map> eventsByDay=eventsInMonth.stream().collect(Collectors.groupingBy(a->{
+ if(a instanceof User u)
+ return u.birthDate.getDayOfMonth();
+ else if(a instanceof Group g)
+ return g.eventStartTime.atZone(timeZone).getDayOfMonth();
+ else
+ throw new IllegalStateException();
+ }));
+ model.with("calendarEvents", eventsByDay);
+ }
+ model.pageTitle(lang(req).get("events_calendar_title"));
+
+ if(isAjax(req)){
+ return new WebDeltaResponse(resp).setContent("eventsCalendarW", model.renderToString());
+ }
+
+ return model;
+ }
+
+ public static Object eventCalendarMobile(Request req, Response resp, Account self){
+ RenderedTemplateResponse model=new RenderedTemplateResponse("events_calendar", req);
+ Lang l=lang(req);
+ Instant now=Instant.now();
+ ZoneId timeZone=timeZoneForRequest(req).toZoneId();
+ LocalDate today=LocalDate.now(timeZone);
+ int month=safeParseInt(req.queryParams("month"));
+ int year=safeParseInt(req.queryParams("year"));
+ LocalDate monthStart;
+ if(month<1 || month>12 || year==0){
+ monthStart=LocalDate.now(timeZone).withDayOfMonth(1);
+ month=monthStart.getMonthValue();
+ year=monthStart.getYear();
+ }else{
+ monthStart=LocalDate.of(year, month, 1);
+ }
+ model.with("month", month).with("year", year);
+ ArrayList