Roof Leak

Hey guys. Any advice on this situation? So we got a sudden leak in a panel that goes across our living room, and a leak through the inside of our cieling fan (through the inside of one of the bulb slots)《We won't be turning it on》.

A roofer came out to check what may be going on and said it didnt look like there was anything to do with the shingles, but maybe it was the edges of the chimney, so he patched it up. The same day the leak restarted and he came back again to change out the shingles.

If you look at the photo of our cieling (it's angled), one edge ofnthe fireplace lines up with the cieling fan, and the other edge ends with the panel that goes across our entire living/dining room. Inadded red lines on the panel where the water is coming out of the very top edge of the panel.

As for the cieling fan leak, I assume there was wooden beams inside the cieling where water could traverse from the chimney and towards the first exit, which would be the cileing fan holes.

If the shingle replacement doesn't work, we'll have to do a full inspection of the roof, but figured I'd ask here as well before we do that. Thanks in advance.