Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
M
mastofe
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
This is an archived project. Repository and other project resources are read-only.
Show more breadcrumbs
Pleroma
mastofe
Commits
ff87d1bc
Unverified
Commit
ff87d1bc
authored
7 years ago
by
Eugen Rochko
Committed by
GitHub
7 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Rescue SSL errors when processing mentions, remove useless line (#7184)
parent
1957209e
Branches
Branches containing commit
Tags
Tags containing commit
1 merge request
!8
WIP: Backport from Mastodon FE main to support the "Direct messages" column and Lists
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
app/services/process_mentions_service.rb
+1
-3
1 addition, 3 deletions
app/services/process_mentions_service.rb
with
1 addition
and
3 deletions
app/services/process_mentions_service.rb
+
1
−
3
View file @
ff87d1bc
...
...
@@ -17,13 +17,11 @@ class ProcessMentionsService < BaseService
if
mention_undeliverable?
(
status
,
mentioned_account
)
begin
mentioned_account
=
resolve_account_service
.
call
(
$1
)
rescue
Goldfinger
::
Error
,
HTTP
::
Error
rescue
Goldfinger
::
Error
,
HTTP
::
Error
,
OpenSSL
::
SSL
::
SSLError
,
Mastodon
::
UnexpectedResponseError
mentioned_account
=
nil
end
end
mentioned_account
||=
Account
.
find_remote
(
username
,
domain
)
next
match
if
mention_undeliverable?
(
status
,
mentioned_account
)
mentioned_account
.
mentions
.
where
(
status:
status
).
first_or_create
(
status:
status
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment