Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Pleroma
pleroma
Commits
8cd3eada
Verified
Commit
8cd3eada
authored
Mar 05, 2019
by
Haelwenn
Browse files
[Credo] write large numbers with underscore separation
parent
c3d41b2b
Changes
4
Hide whitespace changes
Inline
Side-by-side
lib/pleroma/application.ex
View file @
8cd3eada
...
...
@@ -48,7 +48,7 @@ def start(_type, _args) do
[
:user_cache
,
[
default_ttl:
25000
,
default_ttl:
25
_
000
,
ttl_interval:
1000
,
limit:
2500
]
...
...
@@ -60,7 +60,7 @@ def start(_type, _args) do
[
:object_cache
,
[
default_ttl:
25000
,
default_ttl:
25
_
000
,
ttl_interval:
1000
,
limit:
2500
]
...
...
lib/pleroma/user.ex
View file @
8cd3eada
...
...
@@ -285,7 +285,7 @@ def needs_update?(%User{local: true}), do: false
def
needs_update?
(%
User
{
local:
false
,
last_refreshed_at:
nil
}),
do
:
true
def
needs_update?
(%
User
{
local:
false
}
=
user
)
do
NaiveDateTime
.
diff
(
NaiveDateTime
.
utc_now
(),
user
.
last_refreshed_at
)
>=
86400
NaiveDateTime
.
diff
(
NaiveDateTime
.
utc_now
(),
user
.
last_refreshed_at
)
>=
86
_
400
end
def
needs_update?
(
_
),
do
:
true
...
...
lib/pleroma/web/channels/user_socket.ex
View file @
8cd3eada
...
...
@@ -23,7 +23,7 @@ defmodule Pleroma.Web.UserSocket do
# performing token verification on connect.
def
connect
(%{
"token"
=>
token
},
socket
)
do
with
true
<-
Pleroma
.
Config
.
get
([
:chat
,
:enabled
]),
{
:ok
,
user_id
}
<-
Phoenix
.
Token
.
verify
(
socket
,
"user socket"
,
token
,
max_age:
84600
),
{
:ok
,
user_id
}
<-
Phoenix
.
Token
.
verify
(
socket
,
"user socket"
,
token
,
max_age:
84
_
600
),
%
User
{}
=
user
<-
Pleroma
.
Repo
.
get
(
User
,
user_id
)
do
{
:ok
,
assign
(
socket
,
:user_name
,
user
.
nickname
)}
else
...
...
lib/pleroma/web/salmon/salmon.ex
View file @
8cd3eada
...
...
@@ -86,10 +86,10 @@ def encode_key({:RSAPublicKey, modulus, exponent}) do
# Native generation of RSA keys is only available since OTP 20+ and in default build conditions
# We try at compile time to generate natively an RSA key otherwise we fallback on the old way.
try
do
_
=
:public_key
.
generate_key
({
:rsa
,
2048
,
65537
})
_
=
:public_key
.
generate_key
({
:rsa
,
2048
,
65
_
537
})
def
generate_rsa_pem
do
key
=
:public_key
.
generate_key
({
:rsa
,
2048
,
65537
})
key
=
:public_key
.
generate_key
({
:rsa
,
2048
,
65
_
537
})
entry
=
:public_key
.
pem_entry_encode
(
:RSAPrivateKey
,
key
)
pem
=
:public_key
.
pem_encode
([
entry
])
|>
String
.
trim_trailing
()
{
:ok
,
pem
}
...
...
Write
Preview
Supports
Markdown
0%
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!
Cancel
Please
register
or
sign in
to comment