Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: change avatar management #2112

Merged
merged 162 commits into from
Aug 17, 2019
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
162 commits
Select commit Hold shift + click to select a range
cbfcf88
preliminary work
djaiss Nov 19, 2018
940501b
Apply fixes from StyleCI
djaiss Nov 19, 2018
c7f54ad
gravatar service
djaiss Nov 20, 2018
67cfdfc
Merge branch '2018-11-17-new-avatars' of github.com:monicahq/monica i…
djaiss Nov 20, 2018
d0918e5
Apply fixes from StyleCI
djaiss Nov 20, 2018
b700904
get avatars from internet service
djaiss Nov 20, 2018
9fdaf57
more services
djaiss Nov 20, 2018
6978665
Apply fixes from StyleCI
djaiss Nov 20, 2018
06f610d
add the photo object
djaiss Nov 20, 2018
6a4c21f
Apply fixes from StyleCI
djaiss Nov 20, 2018
1fde7b0
start rewriting the getAvatarURL method
djaiss Nov 20, 2018
68fb6ee
Merge branch '2018-11-17-new-avatars' of github.com:monicahq/monica i…
djaiss Nov 20, 2018
1c60812
remove a bunch of tests
djaiss Nov 21, 2018
60d3c83
complete task unit tests
djaiss Nov 21, 2018
36984db
wip
djaiss Nov 21, 2018
f944057
tests
djaiss Nov 22, 2018
041c2db
Apply fixes from StyleCI
djaiss Nov 22, 2018
23fb37b
more changes
djaiss Nov 23, 2018
15f07d7
Apply fixes from StyleCI
djaiss Nov 23, 2018
28b21f5
merge upstream
djaiss Nov 23, 2018
63deb7b
Apply fixes from StyleCI
djaiss Nov 23, 2018
cf37b2d
fix
djaiss Nov 23, 2018
685d6c6
Merge branch '2018-11-17-new-avatars' of github.com:monicahq/monica i…
djaiss Nov 23, 2018
ce413ea
wip
djaiss Nov 25, 2018
6a95d8d
Apply fixes from StyleCI
djaiss Nov 25, 2018
045a65b
wip
djaiss Nov 25, 2018
bf6fce3
Merge branch '2018-11-17-new-avatars' of github.com:monicahq/monica i…
djaiss Nov 25, 2018
e1237a8
Apply fixes from StyleCI
djaiss Nov 25, 2018
8cae9b8
changes
djaiss Nov 26, 2018
1f9e239
Apply fixes from StyleCI
djaiss Nov 26, 2018
84a367b
change default avatar if avatar was a photo and it's deleted
djaiss Nov 26, 2018
ac1b477
Apply fixes from StyleCI
djaiss Nov 26, 2018
58f6ffc
wip
djaiss Nov 27, 2018
132d487
wip
djaiss Nov 28, 2018
f554758
wip
djaiss Nov 28, 2018
7599c77
Merge branch 'master' into 2018-11-17-new-avatars
djaiss Nov 28, 2018
4266c0d
wip
djaiss Nov 28, 2018
eacfa50
Apply fixes from StyleCI
djaiss Nov 28, 2018
e3e217f
add requires_subscription check
djaiss Nov 28, 2018
46f9229
Merge branch '2018-11-17-new-avatars' of github.com:monicahq/monica i…
djaiss Nov 28, 2018
da522dd
add i18n
djaiss Nov 28, 2018
886fc2b
wip
djaiss Nov 29, 2018
a079dca
wip
djaiss Nov 29, 2018
3ee53c6
Apply fixes from StyleCI
djaiss Nov 29, 2018
77cf1fe
finalize
djaiss Dec 1, 2018
5254f6a
wip
djaiss Dec 1, 2018
3fe13fd
wip
djaiss Dec 1, 2018
1a364b1
wip
djaiss Dec 1, 2018
032c01c
wip
djaiss Dec 1, 2018
d336be6
wip
djaiss Dec 1, 2018
0fdd7f8
it should work now
djaiss Dec 1, 2018
7b557cb
Apply fixes from StyleCI
djaiss Dec 1, 2018
c9aba50
wip
djaiss Dec 1, 2018
f2f7464
wip
djaiss Dec 1, 2018
812a0a1
first step to accept default avatars
djaiss Dec 2, 2018
ee60c91
Merge branch '2018-11-17-new-avatars' of github.com:monicahq/monica i…
djaiss Dec 2, 2018
fa540a1
Apply fixes from StyleCI
djaiss Dec 2, 2018
12cee80
Merge branch 'master' into 2018-11-17-new-avatars
djaiss Dec 2, 2018
0599d94
use default avatar
djaiss Dec 2, 2018
52cc780
Apply fixes from StyleCI
djaiss Dec 2, 2018
35bab66
allow users to change avatar using the default one
djaiss Dec 2, 2018
b5f5ebb
Merge branch '2018-11-17-new-avatars' of github.com:monicahq/monica i…
djaiss Dec 2, 2018
4238cb4
replac avatars on the list of contacts with the new avatars
djaiss Dec 2, 2018
e12c076
chore(assets): Update assets
MonicaBot Dec 2, 2018
5cdaea1
generate avatars for the existing contacts
djaiss Dec 2, 2018
aa01bd1
update assets
djaiss Dec 2, 2018
9f43f5b
Merge branch '2018-11-17-new-avatars' of github.com:monicahq/monica i…
djaiss Dec 2, 2018
9c68830
Apply fixes from StyleCI
djaiss Dec 2, 2018
f24cbbb
update different views with new avatars
djaiss Dec 2, 2018
078260d
fix tests
djaiss Dec 3, 2018
3f81fff
Merge branch '2018-11-17-new-avatars' of github.com:monicahq/monica i…
djaiss Dec 3, 2018
c815c09
fix palsm
djaiss Dec 3, 2018
4468dce
Merge branch 'master' into 2018-11-17-new-avatars
djaiss Dec 13, 2018
6e8ffa0
fix mistakes
djaiss Dec 13, 2018
6e61da2
add create contact service and first step of update contact service
djaiss Dec 14, 2018
eb31650
Apply fixes from StyleCI
djaiss Dec 14, 2018
359dab9
wip
djaiss Dec 14, 2018
c373f80
Apply fixes from StyleCI
djaiss Dec 14, 2018
0a17c18
chore(assets): Update assets
MonicaBot Dec 14, 2018
c93803d
enhancements
djaiss Dec 14, 2018
a1fa7bd
Merge branch '2018-11-17-new-avatars' of github.com:monicahq/monica i…
djaiss Dec 14, 2018
b34b5eb
wip
djaiss Dec 15, 2018
a848d04
Merge branch 'master' into 2018-11-17-new-avatars
djaiss Dec 15, 2018
aa6cfa3
Apply fixes from StyleCI
djaiss Dec 15, 2018
769e562
several fixes
djaiss Dec 16, 2018
ef6ae7e
Apply fixes from StyleCI
djaiss Dec 16, 2018
65ae7d2
fixes
djaiss Dec 16, 2018
be073a6
update changelog
djaiss Dec 16, 2018
3ba146f
Merge branch 'master' into 2018-11-17-new-avatars
djaiss Jan 12, 2019
24a320d
Apply fixes from StyleCI
djaiss Jan 12, 2019
ddc16b7
update assets
djaiss Jan 12, 2019
5975171
Merge branch '2018-11-17-new-avatars' of github.com:monicahq/monica i…
djaiss Jan 12, 2019
ab11fb5
Merge branch 'master' into 2018-11-17-new-avatars
djaiss Jan 12, 2019
13604a3
chore(assets): Update assets
MonicaBot Jan 12, 2019
c7a980f
Merge branch 'master' into 2018-11-17-new-avatars
djaiss Jan 12, 2019
2184be7
change order
djaiss Jan 12, 2019
a70daa4
Merge remote-tracking branch 'origin/master' into 2018-11-17-new-avatars
asbiin Mar 6, 2019
d48a12f
Fix services
asbiin Mar 6, 2019
8bfb31d
Fix updatecontact service
asbiin Mar 6, 2019
8da7499
Fix phpstan
asbiin Mar 6, 2019
6bb01c9
fix
asbiin Mar 6, 2019
2c310ce
use singleton
asbiin Mar 7, 2019
05caf2a
some fixes
asbiin Mar 7, 2019
af2fa65
optimisation
asbiin Mar 7, 2019
707de55
Apply fixes from StyleCI
asbiin Mar 7, 2019
01f49e5
fix
asbiin Mar 7, 2019
8994ec6
Move test
asbiin Mar 7, 2019
a68def2
update
asbiin Mar 7, 2019
8390cbb
fixes
asbiin Mar 8, 2019
f6af497
Fix config
asbiin Mar 9, 2019
9ef9103
fix route
asbiin Mar 9, 2019
095c9e1
use xdebug
asbiin Mar 10, 2019
5f5c500
fixes
asbiin Mar 10, 2019
7360bb3
indentation
asbiin Mar 10, 2019
dea9742
fix sonar
asbiin Mar 10, 2019
129b60a
Merge remote-tracking branch 'origin/master' into 2018-11-17-new-avatars
asbiin Mar 12, 2019
c339717
Merge remote-tracking branch 'origin/master' into 2018-11-17-new-avatars
asbiin Jun 1, 2019
76bfbd9
Apply fixes from StyleCI
asbiin Jun 1, 2019
f4f7456
Remove RandomHelper
asbiin Jun 1, 2019
1c5ef9d
Update layout
asbiin Jun 6, 2019
02c8e40
chore(assets): Update assets
MonicaBot Jun 6, 2019
2734a13
Merge remote-tracking branch 'origin/master' into 2018-11-17-new-avatars
asbiin Jun 26, 2019
f620786
fixes
asbiin Jun 26, 2019
f3ba64a
Merge remote-tracking branch 'origin/master' into 2018-11-17-new-avatars
asbiin Jul 10, 2019
a157c46
Change command into job
asbiin Jul 10, 2019
ad204b6
Apply fixes from StyleCI
asbiin Jul 10, 2019
afd66e9
Add delay
asbiin Jul 10, 2019
0897aed
Apply fixes from StyleCI
asbiin Jul 10, 2019
20e2f74
Fix tests
asbiin Jul 10, 2019
cb42934
Fix tests
asbiin Jul 10, 2019
6f7aa76
add alt
asbiin Jul 10, 2019
bab658d
Fix photo controller
asbiin Jul 10, 2019
00edf84
Apply fixes from StyleCI
asbiin Jul 10, 2019
3c57343
Add tests
asbiin Jul 10, 2019
06bc117
Apply fixes from StyleCI
asbiin Jul 10, 2019
54af4d0
Fix test
asbiin Jul 10, 2019
2517395
Add test
asbiin Jul 11, 2019
3a7c05b
Apply fixes from StyleCI
asbiin Jul 11, 2019
3a82c19
vueize avatar edit
asbiin Jul 11, 2019
9d53bb8
Merge remote-tracking branch 'origin/master' into 2018-11-17-new-avatars
asbiin Aug 10, 2019
8e5fa99
fix tests
asbiin Aug 10, 2019
e958c7d
Reduce time
asbiin Aug 10, 2019
ee27629
Fix UI
asbiin Aug 10, 2019
04d1e17
Merge remote-tracking branch 'origin/master' into 2018-11-17-new-avatars
asbiin Aug 11, 2019
62f7fd2
fix maxsize test
asbiin Aug 11, 2019
580cb18
Merge remote-tracking branch 'origin/master' into 2018-11-17-new-avatars
asbiin Aug 12, 2019
8e5d0a7
reduce number of contacts treated each minute
asbiin Aug 12, 2019
6c1808d
Rename migrations
asbiin Aug 13, 2019
4c386f8
Fix job
asbiin Aug 13, 2019
0f10a0e
Use default filesystem
asbiin Aug 13, 2019
f0f0515
add message
asbiin Aug 13, 2019
2bc932d
Apply fixes from StyleCI
asbiin Aug 13, 2019
b1e3cf3
Force new storage to the default one
asbiin Aug 13, 2019
ffdb8a2
Apply fixes from StyleCI
asbiin Aug 13, 2019
cd0a165
Add tests
asbiin Aug 13, 2019
d49d2e0
Fix bad code
asbiin Aug 13, 2019
a17ec12
Merge remote-tracking branch 'origin/master' into 2018-11-17-new-avatars
asbiin Aug 17, 2019
bac31f8
Merge remote-tracking branch 'origin/master' into 2018-11-17-new-avatars
asbiin Aug 17, 2019
ea2decf
Display avatar on searches
asbiin Aug 17, 2019
2024770
Add a fallback if default avata not exists
asbiin Aug 17, 2019
eef02e2
Merge remote-tracking branch 'origin/master' into 2018-11-17-new-avatars
asbiin Aug 17, 2019
c3052e8
Fix changelog date
asbiin Aug 17, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Apply fixes from StyleCI
  • Loading branch information
djaiss authored and StyleCIBot committed Nov 20, 2018
commit 6978665c1d1eaf5f2f3d94d42c30e6d3207d4cc1
5 changes: 1 addition & 4 deletions app/Services/Contact/Avatar/GetAdorableAvatar.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,6 @@
namespace App\Services\Contact\Avatar;

use App\Services\BaseService;
use App\Models\Contact\Contact;
use App\Models\Contact\Message;
use App\Models\Contact\Conversation;

class GetAdorableAvatar extends BaseService
{
Expand Down Expand Up @@ -35,7 +32,7 @@ public function execute(array $data)

$size = $this->size($data);

return 'https://api.adorable.io/avatars/' . $size . '/' . $data['uuid'] . '.png';
return 'https://api.adorable.io/avatars/'.$size.'/'.$data['uuid'].'.png';
}

/**
Expand Down
4 changes: 0 additions & 4 deletions app/Services/Contact/Avatar/GetAvatarsFromInternet.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,6 @@

use App\Services\BaseService;
use App\Models\Contact\Contact;
use App\Models\Contact\Message;
use App\Models\Contact\Conversation;
use App\Services\Contact\Avatar\GetAdorableAvatar;
use App\Services\Contact\Avatar\GetGravatar;

class GetAvatarsFromInternet extends BaseService
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
namespace Tests\Unit\Services\Contact\url;

use Tests\TestCase;
use App\Services\Contact\Avatar\GetAdorableAvatar;
use App\Exceptions\MissingParameterException;
use App\Services\Contact\Avatar\GetAdorableAvatar;
use Illuminate\Foundation\Testing\DatabaseTransactions;

class GetAdorableAvatarTest extends TestCase
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@

use Tests\TestCase;
use App\Models\Contact\Contact;
use App\Models\Contact\ContactFieldType;
use App\Models\Contact\ContactField;
use App\Services\Contact\Avatar\GetAvatarsFromInternet;
use App\Models\Contact\ContactFieldType;
use App\Exceptions\MissingParameterException;
use App\Services\Contact\Avatar\GetAvatarsFromInternet;
use Illuminate\Foundation\Testing\DatabaseTransactions;

class GetAvatarsFromInternetTest extends TestCase
Expand Down