Make ContactsStore a public API #6637

LEDfan · 2017-09-25T10:57:39Z

This makes the ContactsStore a public API which can be used by apps. As I described here: #5585 (comment) this is needed for e.g. the Chat app to know which users are allowed to Chat with other users.

mention-bot · 2017-09-25T10:57:42Z

@LEDfan, thanks for your PR! By analyzing the history of the files in this pull request, we identified @LukasReschke, @icewind1991 and @rullzer to be potential reviewers.

LEDfan · 2017-09-25T10:58:21Z

apps/dav/appinfo/app.php

@@ -52,5 +52,7 @@ function(GenericEvent $event) use ($app) {
 	$user = \OC::$server->getUserSession()->getUser();
 	if (!is_null($user)) {
 		$app->setupContactsProvider($cm, $user->getUID());
+	} else {
+		$app->setupSystemContactsProvider($cm);


This change is needed when there is no users, e.g on the CLI using the occ command.

ChristophWurst

Looks good so far, just some minor documentation/code style issues

ChristophWurst · 2017-09-25T11:33:28Z

lib/public/Contacts/ContactsMenu/IContactsStore.php

+
+use OCP\IUser;
+
+interface IContactsStore {


missing @since annotations on both the interface and its methods

ChristophWurst · 2017-09-25T11:33:33Z

lib/public/Contacts/ContactsMenu/IContactsStore.php

+	 */
+	public function findOne(IUser $user, $shareType, $shareWith);
+
+}


new line missing

codecov · 2017-10-01T07:15:58Z

Codecov Report

Merging #6637 into master will decrease coverage by <.01%.
The diff coverage is 28.57%.

@@             Coverage Diff              @@
##             master    #6637      +/-   ##
============================================
- Coverage     51.09%   51.09%   -0.01%     
- Complexity    24865    24867       +2     
============================================
  Files          1596     1596              
  Lines         94608    94622      +14     
  Branches       1367     1367              
============================================
+ Hits          48340    48344       +4     
- Misses        46268    46278      +10

Impacted Files	Coverage Δ	Complexity Δ
...ib/private/Contacts/ContactsMenu/ContactsStore.php	`86% <ø> (ø)`	`41 <0> (ø)`	⬇️
apps/dav/lib/AppInfo/Application.php	`18.36% <0%> (-0.79%)`	`15 <1> (+1)`
apps/dav/appinfo/app.php	`26.66% <0%> (-1.91%)`	`0 <0> (ø)`
apps/dav/lib/CardDAV/ContactsManager.php	`85% <100%> (+1.66%)`	`5 <1> (+1)`	⬆️
lib/private/Server.php	`81.5% <28.57%> (-0.43%)`	`133 <0> (ø)`
apps/files_trashbin/lib/Trashbin.php	`72.28% <0%> (-0.25%)`	`136% <0%> (ø)`
apps/files_trashbin/lib/Expiration.php	`91.93% <0%> (+1.61%)`	`29% <0%> (ø)`	⬇️

LEDfan · 2017-10-01T07:16:09Z

@ChristophWurst done

LEDfan · 2017-12-03T15:31:43Z

This is still tagged for NC 13, does this mean it will be merged before 13? I forgot about the featue-freeze to bump this in time...
Thanks!

MorrisJobke · 2017-12-08T15:44:13Z

This is still tagged for NC 13, does this mean it will be merged before 13? I forgot about the featue-freeze to bump this in time...
Thanks!

We plan to do the beta2 soon (at least middle of next week, looking at the other open PRs). I would like to have feedback from @rullzer or @ChristophWurst on this one here.

MorrisJobke · 2017-12-08T15:44:33Z

And please fix the conflicts ;)

LEDfan · 2017-12-09T13:09:06Z

@MorrisJobke I fixed the conflicts.

MorrisJobke · 2017-12-10T09:24:38Z

@LEDfan Because you added a new PHP class could you dump the autoloader again:

The autoloaders are not up to date
Please run: bash build/autoloaderchecker.sh
And commit the result

ChristophWurst · 2017-12-10T10:34:04Z

lib/private/Server.php

@@ -1109,6 +1110,15 @@ public function __construct($webRoot, \OC\Config $config) {
 				$c->getConfig()
 			);
 		});
+
+		$this->registerService(\OCP\Contacts\ContactsMenu\IContactsStore::class, function(Server $c) {


Register it as alias with $this->registerAlias(\OCP\Contacts\ContactsMenu\IContactsStore::class, \OC\Contacts\ContactsMenu\ContactsStore); and the DI container will resolve the constructor args automatically. This also prevents the contacts store being instantiated twice.

LEDfan · 2017-12-10T11:00:14Z

@MorrisJobke @ChristophWurst thanks, I updated the PR 😄

ChristophWurst

Changes look good

blizzz · 2017-12-11T15:30:46Z

more conflicts @LEDfan

MorrisJobke · 2017-12-11T16:20:28Z

Fixed the conflicts in the server container. Nothing crucial.

MorrisJobke · 2017-12-11T17:17:44Z

Ah ... and conflicts again in the same file ... let me rebase a last time 🙈

Signed-off-by: Tobia De Koninck <tobia@ledfan.be>

LEDfan added the 3. to review Waiting for reviews label Sep 25, 2017

LEDfan requested a review from ChristophWurst September 25, 2017 10:57

LEDfan commented Sep 25, 2017

View reviewed changes

ChristophWurst requested changes Sep 25, 2017

View reviewed changes

rullzer added this to the Nextcloud 13 milestone Sep 27, 2017

LEDfan mentioned this pull request Oct 1, 2017

Limit chatting to users in your group and allow to exclude certain groups nextcloud/jsxc.nextcloud#57

Merged

14 tasks

MorrisJobke requested a review from rullzer December 8, 2017 15:44

MorrisJobke added 2. developing Work in progress and removed 3. to review Waiting for reviews labels Dec 8, 2017

MorrisJobke mentioned this pull request Dec 8, 2017

13.0.0 beta 2 #7425

Merged

28 tasks

LEDfan force-pushed the contactsstore_public_api branch from 8dbc639 to 3b2e916 Compare December 9, 2017 08:45

LEDfan added 3. to review Waiting for reviews and removed 2. developing Work in progress labels Dec 9, 2017

ChristophWurst requested changes Dec 10, 2017

View reviewed changes

ChristophWurst approved these changes Dec 10, 2017

View reviewed changes

blizzz approved these changes Dec 11, 2017

View reviewed changes

MorrisJobke force-pushed the contactsstore_public_api branch from 9bb7f5b to adf7d11 Compare December 11, 2017 16:19

MorrisJobke added 4. to release Ready to be released and/or waiting for tests to finish and removed 3. to review Waiting for reviews labels Dec 11, 2017

LEDfan added 3 commits December 11, 2017 18:18

Make ContactsStore a public API

f6ef779

Signed-off-by: Tobia De Koninck <tobia@ledfan.be>

Add @SInCE annotation and add missing new line

78049af

Signed-off-by: Tobia De Koninck <tobia@ledfan.be>

Register ContactsStore using alias + run autoloaderchecker.sh

cecfc28

Signed-off-by: Tobia De Koninck <tobia@ledfan.be>

MorrisJobke force-pushed the contactsstore_public_api branch from adf7d11 to cecfc28 Compare December 11, 2017 17:19

rullzer merged commit 179be8d into master Dec 11, 2017

rullzer deleted the contactsstore_public_api branch December 11, 2017 19:04

ChristophWurst added the pending documentation This pull request needs an associated documentation update label Oct 17, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Make ContactsStore a public API #6637

Make ContactsStore a public API #6637

LEDfan commented Sep 25, 2017

mention-bot commented Sep 25, 2017

LEDfan Sep 25, 2017

ChristophWurst left a comment

ChristophWurst Sep 25, 2017

ChristophWurst Sep 25, 2017

codecov bot commented Oct 1, 2017 •

edited

Loading

LEDfan commented Oct 1, 2017

LEDfan commented Dec 3, 2017

MorrisJobke commented Dec 8, 2017

MorrisJobke commented Dec 8, 2017

LEDfan commented Dec 9, 2017

MorrisJobke commented Dec 10, 2017

ChristophWurst Dec 10, 2017

LEDfan commented Dec 10, 2017

ChristophWurst left a comment

blizzz commented Dec 11, 2017

MorrisJobke commented Dec 11, 2017

MorrisJobke commented Dec 11, 2017

Make ContactsStore a public API #6637

Make ContactsStore a public API #6637

Conversation

LEDfan commented Sep 25, 2017

mention-bot commented Sep 25, 2017

LEDfan Sep 25, 2017

Choose a reason for hiding this comment

ChristophWurst left a comment

Choose a reason for hiding this comment

ChristophWurst Sep 25, 2017

Choose a reason for hiding this comment

ChristophWurst Sep 25, 2017

Choose a reason for hiding this comment

codecov bot commented Oct 1, 2017 • edited Loading

Codecov Report

LEDfan commented Oct 1, 2017

LEDfan commented Dec 3, 2017

MorrisJobke commented Dec 8, 2017

MorrisJobke commented Dec 8, 2017

LEDfan commented Dec 9, 2017

MorrisJobke commented Dec 10, 2017

ChristophWurst Dec 10, 2017

Choose a reason for hiding this comment

LEDfan commented Dec 10, 2017

ChristophWurst left a comment

Choose a reason for hiding this comment

blizzz commented Dec 11, 2017

MorrisJobke commented Dec 11, 2017

MorrisJobke commented Dec 11, 2017

codecov bot commented Oct 1, 2017 •

edited

Loading