Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
bitmask-vpn
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
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
Show more breadcrumbs
Vladimir KozLove
bitmask-vpn
Commits
efde1a42
Unverified
Commit
efde1a42
authored
4 years ago
by
Kali Kaneko
Browse files
Options
Downloads
Patches
Plain Diff
[feat] increase donation reminder interval to one week
- Resolves: #358
parent
1cd5398a
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
branding/config/vendor.conf
+1
-6
1 addition, 6 deletions
branding/config/vendor.conf
gui/providers/providers.json
+16
-16
16 additions, 16 deletions
gui/providers/providers.json
pkg/config/gui.go
+2
-1
2 additions, 1 deletion
pkg/config/gui.go
with
19 additions
and
23 deletions
branding/config/vendor.conf
+
1
−
6
View file @
efde1a42
[
default
]
provider
=
demolib
bitmask
-
providers
= [
riseup
,
calyx
]
provider
=
riseup
[
riseup
]
...
...
@@ -20,7 +18,6 @@ tosURL = https://riseup.net/tos
helpURL
=
https
://
riseup
.
net
/
support
geolocationAPI
=
https
://
api
.
black
.
riseup
.
net
:
9001
/
json
askForDonations
=
true
donateURL
=
https
://
riseup
.
net
/
vpn
/
donate
...
...
@@ -41,7 +38,6 @@ tosURL = https://calyx.net/tos
helpURL
=
https
://
calyx
.
net
/
support
geolocationAPI
=
https
://
api
.
black
.
riseup
.
net
:
9001
/
json
askForDonations
=
false
donateURL
=
...
...
@@ -63,6 +59,5 @@ tosURL = https://libraryvpn.org/
helpURL
=
https
://
libraryvpn
.
org
/
geolocationAPI
=
https
://
getmyip
.
vpnlib
.
bitmask
.
net
/
json
askForDonations
=
false
donateURL
=
This diff is collapsed.
Click to expand it.
gui/providers/providers.json
+
16
−
16
View file @
efde1a42
{
"default"
:
"
demolib
"
,
"default"
:
"
riseup
"
,
"providers"
:
[
{
"name"
:
"
demolib
"
,
"applicationName"
:
"
DemoLib
VPN"
,
"binaryName"
:
"
demolib
-vpn"
,
"auth"
:
"
sip
"
,
"authEmptyPass"
:
true
,
"providerURL"
:
"
vpnlib.bitmask
.net"
,
"tosURL"
:
"https://
libraryvpn.org/
"
,
"helpURL"
:
"https://
libraryvpn.org/
"
,
"askForDonations"
:
false
,
"donateURL"
:
""
,
"apiURL"
:
"https://api.
vpnlib.bitmask.net:4430
/"
,
"geolocationAPI"
:
"https://
getmyip.vpnlib.bitmask.net
/json"
,
"caCertString"
:
"-----BEGIN CERTIFICATE-----
\n
MII
BQzCB6aADAgECAgEBMAoGCCqGSM49BAMCMBcxFTATBgNVBAMTDExFQVAgUm9v
\n
dCBDQTAeFw0y
MDA
4
MD
YxOTA3NDRaFw0yNTA4MDYxOTEyNDRaMBcxFTATBgNVBAMT
\n
DExFQVAgUm9vdCBDQTBZMBMGByqGSM49AgE
GC
C
qGS
M49AwEHA0IABIG5POr4cAdK
\n
kTavKpSJr8nW1V7HLpr27qKaShpk1TUy5ipaAlusmavGLxKsPE+i3AMlvf/f6ch3
\n
1MjAtIf5rYujJjAkMA4GA1UdDwEB/wQEAwICpDASBgNVHRMBAf8ECDAGAQH/AgEB
\n
MAoGCCqGSM49BAMCA0kAMEYCIQDXj280LNZbSbi0Y2WvtQrJBUw4wdm8qAeOeuH7
\n
6XiLEwIhAPBRsmst/ujcChsG2t6LpG+p8s4rfIfh8YLo/4qrcc5p
\n
-----END CERTIFICATE-----"
,
"timeStamp"
:
"2020-
09-25 13:05
:4
7
"
"name"
:
"
Riseup
"
,
"applicationName"
:
"
Riseup
VPN"
,
"binaryName"
:
"
riseup
-vpn"
,
"auth"
:
"
anon
"
,
"authEmptyPass"
:
null
,
"providerURL"
:
"
riseup
.net"
,
"tosURL"
:
"https://
riseup.net/tos
"
,
"helpURL"
:
"https://
riseup.net/support
"
,
"askForDonations"
:
"true"
,
"donateURL"
:
"
https://riseup.net/vpn/donate
"
,
"apiURL"
:
"https://api.
black.riseup.net
/"
,
"geolocationAPI"
:
"https://
api.black.riseup.net:9001
/json"
,
"caCertString"
:
"-----BEGIN CERTIFICATE-----
\n
MII
FjTCCA3WgAwIBAgIBATANBgkqhkiG9w0BAQ0FADBZMRgwFgYDVQQKDA9SaXNl
\n
dXAgTmV0d29ya3MxGzAZBgNVBAsMEmh0dHBzOi8vcmlzZXVwLm5ldDEgMB4GA1UE
\n
AwwXUmlzZXVwIE5ldHdvcmtzIFJvb3QgQ0EwHhcNMTQwNDI4
MDA
w
MD
AwWhcNMjQw
\n
NDI4MDAwMDAwWjBZMRgwFgYDVQQKDA9SaXNldXAgTmV0d29ya3MxGzAZBgNVBAsM
\n
Emh0dHBzOi8vcmlzZXVwLm5ldDEgMB4GA1UEAwwXUmlzZXVwIE5ldHdvcmtzIFJv
\n
b3QgQ0EwggIiMA0
GC
S
qGS
Ib3DQEBAQUAA4ICDwAwggIKAoICAQC76J4ciMJ8Sg0m
\n
TP7DF2DT9zNe0Csk4myoMFC57rfJeqsAlJCv1XMzBmXrw8wq/9z7XHv6n/0sWU7a
\n
7cF2hLR33ktjwODlx7vorU39/lXLndo492ZBhXQtG1INMShyv+nlmzO6GT7ESfNE
\n
LliFitEzwIegpMqxCIHXFuobGSCWF4N0qLHkq/SYUMoOJ96O3hmPSl1kFDRMtWXY
\n
iw1SEKjUvpyDJpVs3NGxeLCaA7bAWhDY5s5Yb2fA1o8ICAqhowurowJpW7n5ZuLK
\n
5VNTlNy6nZpkjt1QycYvNycffyPOFm/Q/RKDlvnorJIrihPkyniV3YY5cGgP+Qkx
\n
HUOT0uLA6LHtzfiyaOqkXwc4b0ZcQD5Vbf6Prd20Ppt6ei0zazkUPwxld3hgyw58
\n
m/4UIjG3PInWTNf293GngK2Bnz8Qx9e/6TueMSAn/3JBLem56E0WtmbLVjvko+LF
\n
PM5xA+m0BmuSJtrD1MUCXMhqYTtiOvgLBlUm5zkNxALzG+cXB28k6XikXt6MRG7q
\n
hzIPG38zwkooM55yy5i1YfcIi5NjMH6A+t4IJxxwb67MSb6UFOwg5kFokdONZcwj
\n
shczHdG9gLKSBIvrKa03Nd3W2dF9hMbRu//STcQxOailDBQCnXXfAATj9pYzdY4k
\n
ha8VCAREGAKTDAex9oXf1yRuktES4QIDAQABo2AwXjAdBgNVHQ4EFgQUC4tdmLVu
\n
f9hwfK4AGliaet5KkcgwDgYDVR0PAQH/BAQDAgIEMAwGA1UdEwQFMAMBAf8wHwYD
\n
VR0jBBgwFoAUC4tdmLVuf9hwfK4AGliaet5KkcgwDQYJKoZIhvcNAQENBQADggIB
\n
AGzL+GRnYu99zFoy0bXJKOGCF5XUXP/3gIXPRDqQf5g7Cu/jYMID9dB3No4Zmf7v
\n
qHjiSXiS8jx1j/6/Luk6PpFbT7QYm4QLs1f4BlfZOti2KE8r7KRDPIecUsUXW6P/
\n
3GJAVYH/+7OjA39za9AieM7+H5BELGccGrM5wfl7JeEz8in+V2ZWDzHQO4hMkiTQ
\n
4ZckuaL201F68YpiItBNnJ9N5nHr1MRiGyApHmLXY/wvlrOpclh95qn+lG6/2jk7
\n
3AmihLOKYMlPwPakJg4PYczm3icFLgTpjV5sq2md9bRyAg3oPGfAuWHmKj2Ikqch
\n
Td5CHKGxEEWbGUWEMP0s1A/JHWiCbDigc4Cfxhy56CWG4q0tYtnc2GMw8OAUO6Wf
\n
Xu5pYKNkzKSEtT/MrNJt44tTZWbKV/Pi/N2Fx36my7TgTUj7g3xcE9eF4JV2H/sg
\n
tsK3pwE0FEqGnT4qMFbixQmc8bGyuakr23wjMvfO7eZUxBuWYR2SkcP26sozF9PF
\n
tGhbZHQVGZUTVPyvwahMUEhbPGVerOW0IYpxkm0x/eaWdTc4vPpf/rIlgbAjarnJ
\n
UN9SaWRlWKSdP4haujnzCoJbM7dU9bjvlGZNyXEekgeT0W2qFeGGp+yyUWw8tNsp
\n
0BuC1b7uW/bBn/xKm319wXVDvBgZgcktMolak39V7DVO
\n
-----END CERTIFICATE-----"
,
"timeStamp"
:
"2020-
10-06 18:29
:4
0
"
}
]
}
}
\ No newline at end of file
This diff is collapsed.
Click to expand it.
pkg/config/gui.go
+
2
−
1
View file @
efde1a42
...
...
@@ -24,6 +24,7 @@ import (
const
(
oneDay
=
time
.
Hour
*
24
oneWeek
=
oneDay
*
7
oneMonth
=
oneDay
*
30
)
...
...
@@ -72,7 +73,7 @@ func (c *Config) SetUserStoppedVPN(vpnStopped bool) error {
}
func
(
c
*
Config
)
NeedsDonationReminder
()
bool
{
return
!
c
.
hasDonated
()
&&
c
.
file
.
LastReminded
.
Add
(
one
Day
)
.
Before
(
time
.
Now
())
return
!
c
.
hasDonated
()
&&
c
.
file
.
LastReminded
.
Add
(
one
Week
)
.
Before
(
time
.
Now
())
}
func
(
c
*
Config
)
hasDonated
()
bool
{
...
...
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