USSC rulings have been both broad and narrow, and Wickard v Filburn - unlike the Shreveport Rate Cases ruling - was explicitly broad:
"questions of the power of Congress are not to be decided by reference to any formula which would give controlling force to nomenclature such as 'production' and 'indirect' and foreclose consideration of the actual effects of the activity in question upon interstate commerce. [...] But even if appellee's activity be local and though it may not be regarded as commerce, it may still, whatever its nature, be reached by Congress if it exerts a substantial economic effect on interstate commerce and this irrespective of whether such effect is what might at some earlier time have been defined as 'direct' or 'indirect.'"
No, they applied it to guns too. You know that and approve.