webmaster/signal-cli
1
0
Fork 0
mirror of https://github.com/AsamK/signal-cli synced 2025-08-29 10:30:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update code style for text blocks

Browse source
This commit is contained in:
AsamK 2022-05-23 16:24:36 +02:00
parent 621d822a6c
commit 69e952738b
4 changed files with 27 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

1
.idea/codeStyles/Project.xml generated
View file

@ -4,6 +4,7 @@
<JavaCodeStyleSettings> <JavaCodeStyleSettings>
<option name="GENERATE_FINAL_LOCALS" value="true" /> <option name="GENERATE_FINAL_LOCALS" value="true" />
<option name="GENERATE_FINAL_PARAMETERS" value="true" /> <option name="GENERATE_FINAL_PARAMETERS" value="true" />
<option name="ALIGN_MULTILINE_TEXT_BLOCKS" value="true" />
<option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="50" /> <option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="50" />
<option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="50" /> <option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="50" />
<option name="IMPORT_LAYOUT_TABLE"> <option name="IMPORT_LAYOUT_TABLE">

34
lib/src/main/java/org/asamk/signal/manager/storage/sendLog/MessageSendLogStore.java
View file

@ -70,23 +70,23 @@ public class MessageSendLogStore implements AutoCloseable {
public static void createSql(Connection connection) throws SQLException { public static void createSql(Connection connection) throws SQLException {
try (final var statement = connection.createStatement()) { try (final var statement = connection.createStatement()) {
statement.executeUpdate(""" statement.executeUpdate("""
CREATE TABLE message_send_log ( CREATE TABLE message_send_log (
_id INTEGER PRIMARY KEY, _id INTEGER PRIMARY KEY,
content_id INTEGER NOT NULL REFERENCES message_send_log_content (_id) ON DELETE CASCADE, content_id INTEGER NOT NULL REFERENCES message_send_log_content (_id) ON DELETE CASCADE,
recipient_id INTEGER NOT NULL, recipient_id INTEGER NOT NULL,
device_id INTEGER NOT NULL device_id INTEGER NOT NULL
); );
CREATE TABLE message_send_log_content ( CREATE TABLE message_send_log_content (
_id INTEGER PRIMARY KEY, _id INTEGER PRIMARY KEY,
group_id BLOB, group_id BLOB,
timestamp INTEGER NOT NULL, timestamp INTEGER NOT NULL,
content BLOB NOT NULL, content BLOB NOT NULL,
content_hint INTEGER NOT NULL content_hint INTEGER NOT NULL
); );
CREATE INDEX mslc_timestamp_index ON message_send_log_content (timestamp); CREATE INDEX mslc_timestamp_index ON message_send_log_content (timestamp);
CREATE INDEX msl_recipient_index ON message_send_log (recipient_id, device_id, content_id); CREATE INDEX msl_recipient_index ON message_send_log (recipient_id, device_id, content_id);
CREATE INDEX msl_content_index ON message_send_log (content_id); CREATE INDEX msl_content_index ON message_send_log (content_id);
"""); """);
} }
} }

8
src/main/java/org/asamk/signal/commands/RegisterCommand.java
View file

@ -69,10 +69,10 @@ public class RegisterCommand implements RegistrationCommand, JsonRpcRegistration
String message; String message;
if (captcha == null) { if (captcha == null) {
message = """ message = """
Captcha required for verification, use --captcha CAPTCHA Captcha required for verification, use --captcha CAPTCHA
To get the token, go to https://signalcaptchas.org/registration/generate.html To get the token, go to https://signalcaptchas.org/registration/generate.html
Check the developer tools (F12) console for a failed redirect to signalcaptcha:// Check the developer tools (F12) console for a failed redirect to signalcaptcha://
Everything after signalcaptcha:// is the captcha token."""; Everything after signalcaptcha:// is the captcha token.""";
} else { } else {
message = "Invalid captcha given."; message = "Invalid captcha given.";
} }

10
src/main/java/org/asamk/signal/util/SendMessageResultUtils.java
View file

@ -84,11 +84,11 @@ public class SendMessageResultUtils {
+ ( + (
failure.getOptions().contains(ProofRequiredException.Option.RECAPTCHA) failure.getOptions().contains(ProofRequiredException.Option.RECAPTCHA)
? """ ? """
To get the captcha token, go to https://signalcaptchas.org/challenge/generate.html To get the captcha token, go to https://signalcaptchas.org/challenge/generate.html
Check the developer tools (F12) console for a failed redirect to signalcaptcha:// Check the developer tools (F12) console for a failed redirect to signalcaptcha://
Everything after signalcaptcha:// is the captcha token. Everything after signalcaptcha:// is the captcha token.
Use the following command to submit the captcha token: Use the following command to submit the captcha token:
signal-cli submitRateLimitChallenge --challenge CHALLENGE_TOKEN --captcha CAPTCHA_TOKEN""" signal-cli submitRateLimitChallenge --challenge CHALLENGE_TOKEN --captcha CAPTCHA_TOKEN"""
: "" : ""
), ),
identifier, identifier,